From patchwork Fri Jan 12 06:12:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3277 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 12 Jan 2024 07:13:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40C6D8i7005410 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jan 2024 07:13:08 +0100 Received: by mail-wm1-f57.google.com with SMTP id 5b1f17b1804b1-40e41740b6esf52709115e9.3 for ; Thu, 11 Jan 2024 22:13:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705039982; cv=pass; d=google.com; s=arc-20160816; b=sbsv/5f6g/lZy+9IV3hXuFiyscLAwejDnyEWU0cHwV7JfQW/r4xcqFshkqskWkjZp2 euEqgRUkpvl4ymv6+vuOLeNRCVTnXxsY6c0h6EeKDFWCqxHJEzqHsxm58hnz2ntGeA1h IoiBkIsoOVp9fYZV5HIgNgMluFWuQ2OBgyWogAI2mJX9amVmhiOM2MDpJ+BzZGUgNYms 5Hy7HNnYNOagmmVkuJen3pui1Ld3rLb1jUcbkwj2BAM5Xp1Nws08k9TWBNU2obtbScmL drjNdjMg1DhwvlejshVc3b7LMZ20L+7zIdq7WbpgnfTFB/YZP+xIPmsXApDWy+twM+ZE EWbg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=KOUFmNZnOn0QdnABqEsRnxYG2eC9zWmaWAzWT/A0sY4=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=f2GxmRT568FKAPfji6EYYBZ5MSwDV7sD+YFw0PTRkHv9dShoZTuE6IyXdoo/zADG8Z +8CWZEpi/q3m8YwWw16Srk7I97X3X8cMH5rY/3JBajjkpckwi2l8qyXrJVq8CUqibBvl zX4XbwV+zW4N8BtZZOGmtU2NPhYuEmzBNJ+6jpy4Tufc5qzZrfK5VAGwvhQ7LTlzEFcb K6YiNLd+PJM6paOmNoy7nW3lHPWQ1DyU2k0zm8HdH8dyKij3meflBVw8Zdw1dvEZkZMo 5XZ/J3K+A/oP7Zq29ECpBFlA7Q87ZXkgpCJIft7QZ1KF0YRMyElDuwJoY7ajDghKP+l6 ojBw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1705039982; x=1705644782; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=KOUFmNZnOn0QdnABqEsRnxYG2eC9zWmaWAzWT/A0sY4=; b=U5x2H47ZiAp7RXUN2M2WhR8vEOJCluOKbzIE6+HF5bEtZMOBahZk0B7x6nIUp1OKpZ tUqf5DUYxofzNfbNxHkDtAkoEbtQjtmQAMLog5WN+jq8xchZyh26A41c/cYAkqh9pZKM zySo1TYBPTb9LGrRbZc7V3TcdMmDPPQky340nZICHpcRAlvrhNs87cnQagFhlxzeB3WD BSOWs8rVGUTAzQQ7/Jpgcyy+MZfQigtLABgq7761PNj8yIIqbqzWzmxCwaNExH7qkj6u qnWM87+hve+LD2vUoxdSZM20wHhwg+xgqedBQY24yClmxqViTiRCv7Z96FxDF7aApYis RPvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705039982; x=1705644782; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=KOUFmNZnOn0QdnABqEsRnxYG2eC9zWmaWAzWT/A0sY4=; b=Uzhg8jfzBvWcYkqBsTOkJn6aubR3ySTr7WS2dRGfSZXXdVimO2fPyEqotjWJbl5sSX tEoeruQP6DnjMhAz09n60S/BXcsHGZCnduiBIwBSeWuyapcBqAMk3SUD5qF+CwGZjgUR lCwv61SrZjawAAzbMA6EiH1Bw4TBPAo83doharRXyr4Y6LLH2xOe55cqEDQSlNT5bt2B 9l7oIoV3OEPutq03c+aRCobPSmc8MzSZlgEl+gfkarBeQirN0ohagxlRHBADJiV0rs+I X5nAupuUCFSXD+F2UKaLAwOmRmKV6+jswVoCryEZD97mlldCSqp16aw3rUVLu2TGx0/b 0iAw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOJu0YxtaUrLinCTGL7euY8g4zxD1J6CsgP6O2JD55kn26wpCcx/VST7 LiEiz5JOozVpbv9cZjnYqlU= X-Google-Smtp-Source: AGHT+IH8dm+r+AIM0M9dCTXrUdZlhfEjcItrkqppbMsCUpDyseJ7+suV0Kcjp/ZrtKPI1kPLpqaAjQ== X-Received: by 2002:a05:600c:2b0e:b0:40e:4271:69e7 with SMTP id y14-20020a05600c2b0e00b0040e427169e7mr443650wme.218.1705039982182; Thu, 11 Jan 2024 22:13:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:38a:b0:337:7911:9627 with SMTP id u10-20020a056000038a00b0033779119627ls621038wrf.0.-pod-prod-01-eu; Thu, 11 Jan 2024 22:13:00 -0800 (PST) X-Received: by 2002:a05:600c:220f:b0:40e:6089:43c1 with SMTP id z15-20020a05600c220f00b0040e608943c1mr420642wml.235.1705039979737; Thu, 11 Jan 2024 22:12:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705039979; cv=none; d=google.com; s=arc-20160816; b=BzryOctGOyQA1GL0tYz+XuxO0I4wrcGpBEk8kFPXMO+p7Xw1iWB/GsvWb/65X5a+ai WiHePOVYEcTRm/tm7Ka3/m37+uGMheJAVIMDD1I859W/OfWJOTvehtV+kv7ZrngtlFDj AFPEI8/BxDJpk3gLbirshnmV5Vc9KbG0QlxpjKcTzeNXHAUUDby7hGy6G2Y+hTlQTv7o KnZYJb0qNTUnVRR54I0D5oaMGwgxfEj8kg66MLPoRTW6Ns7tZMQkcY8g7P4xB2YgxD6r 83cvm1n61AQqMKayA0Z9T8RaBBh0N3+vQJsagwXrfTNtI21dHb15RqeEjOCNWhXGV9eU LuTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=+oD0dk9Rw0uC9HIqRC4hc72hHFU4Ov/iLGqgcjnJJBM=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=SWXq+aXJZhePElocnD1lK9XmwPr+cXHI8joDr5GTMIOm9Yuibzz7H2HlQAPAWvAXHx OZpC5dbEMM3OIKwBE2ab0xA5P6dFQZaVldLvOEBKflZORh5GnTz91sjWDXnaNjDpXXdX YHNw4gajqDbuMH6VwVViF4LZM9gFqao9NS3bS6QHe+se3VzNcPwrevLfAbau58DwhU9N qQPqYrybl66ABrcv3W/XHbxATV9pgH+sWJEbIUzIydqKNpcpbYzA76dg/RP+ZAyX+ww/ ePNpFGvvOne0rZmTuC0U5w5yNQF2HpkWlUsurujXa2ma+1AFQcxXvRamzdSinmoPRymQ MATw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id h5-20020adffd45000000b0033669c9b77csi85717wrs.3.2024.01.11.22.12.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2024 22:12:59 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 40C6CvqT005370 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jan 2024 07:12:59 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 2/5] buildstats: consider multiconfigs when collecting statistics. Date: Fri, 12 Jan 2024 07:12:54 +0100 Message-Id: <20240112061257.22241-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240112061257.22241-1-ubely@ilbers.de> References: <20240112061257.22241-1-ubely@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= When multiconfigs are used, statistics for the same package name but from the different multiconfigs is collected into the same file. This causes incorrect charts generated with pybootchartgui, when only the most recent part of statistics is shown. This patch adds custom multiconfig prefix to the file names that hold statistics. Signed-off-by: Uladzimir Bely --- meta/classes/buildstats.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass index 0de60520..b417929b 100644 --- a/meta/classes/buildstats.bbclass +++ b/meta/classes/buildstats.bbclass @@ -185,6 +185,8 @@ python run_buildstats () { if bn is not None: bsdir = os.path.join(d.getVar('BUILDSTATS_BASE'), bn) taskdir = os.path.join(bsdir, d.getVar('PF')) + if d.getVar('BB_CURRENT_MC') != 'default': + taskdir = os.path.join(bsdir, d.getVar('BB_CURRENT_MC') + '_' + d.getVar('PF')) if isinstance(e, bb.event.HeartbeatEvent) and bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_INTERVAL")): bb.utils.mkdirhier(bsdir) write_host_data(os.path.join(bsdir, "host_stats_interval"), e, d, "interval")