From patchwork Wed Jun 26 20:36:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13713410 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86D60C30659 for ; Wed, 26 Jun 2024 20:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=m0zVM37WL2jQNln7xrBKCslp+8pFTT04OTNtW91i/Qc=; b=Dn2pshFtINakPenryLRUsTor27 xD5LPY/SlFVEgaNfCb1VMDFnXR4bx1mPYSNVkqVbYrY/Rnuc0SM8QYRNqHJkTvDsT5EFB1h6Ve40d Px3HLN5PlZDHk6u7lZgLrn2SuGc97BMrH6D+JZRnqQg2PWQPf/U8tAYnncPfs3CmP3lTiVwYVD/1n n6UYm2HFRGmHh6zFrUyGG/pErEsdvEFc4oJdS0RGUBQdjf9JjxFoxOr4iIuMVAp+w0llpSghpCyem OTlly57MiOKbCDY8TLdQYIWvSSgf4B63nrTm2JshucaNDpdBFl8gohWhF2LAITWVOv0g0KziJPDB2 M7SMpjxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZSS-00000008HHZ-00wu; Wed, 26 Jun 2024 20:41:36 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZOI-00000008FQ0-2lnJ for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 20:37:21 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-63bf44b87d4so11060787b3.0 for ; Wed, 26 Jun 2024 13:37:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434236; x=1720039036; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=m0zVM37WL2jQNln7xrBKCslp+8pFTT04OTNtW91i/Qc=; b=LZTy0vOZbAqZedNlOZpRp0yyG4b/MIm7ZMaSGQsewHhPi5DSIqDAG+yo7UNkyfWKPQ 4BUB6iecrnwEH0UR1foPW7fWu6dXuN9e6GQFqNYh+NEmp2s5gAJIqlcO4RqFUp9gP950 77mx49XkxTT3SL8IXZTnC8A8yJEJmmsl+9YSqpVFdeZTVHizKpkvzqopEA1FSf+Aqckr c9NiYo3kh4pjHqMku4vjMR4OacBRhGLz7EZC0q5veyVWIRQkbUsaLU0X/GNPeBminfjk YOXQrbG0QsoXLZi0aqpGk7jb6VxA6k0OiZasS6bV646LLvOo5E3mNj6CuHXvsK8eUi0F hr/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434236; x=1720039036; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=m0zVM37WL2jQNln7xrBKCslp+8pFTT04OTNtW91i/Qc=; b=HBbxVIwogXn6mTH6h/hbgs+de2bc5boZvOoXpED1mFG0n7EoZ9c9FyBUMil5jaJabG 8tkMnTr6ZRl2Scj3Ig7SAigx3JHVgQaPfYUe/OTO/Vd6oLQArpxTPsc1ruhamwYP9hUY 5uORURu3BMzJHLd5BO6C0u82eXuMqke0adXNzQ6l8XBPzN5B7+z5wSsX6IcGusjn2hft SI5kaGBOgVjYCv+lhh9OfYyTSf6B0euy7rv25cTPrQPWwhKbhfPZlBvRhBkaQA+S465k n+g5021GHzKhqlldHlkmXXl6RKDIe2uN2QSEto4fkd11yeU/arZSZOtJHVxkwQ7WhVrd F/GQ== X-Forwarded-Encrypted: i=1; AJvYcCViEkww6gkArW6NK7sU1Mz7PBvF9H+O2spy92VEFkqAP0O72JI7HDPqnK34q0UU1kPLzn/Ckkh1e6kAR+CYgcJEzGtKdLy42Qb485uFTfpNcnFydEM= X-Gm-Message-State: AOJu0Yym2yelGcPuD7LMHtQBAF6/aqUmdo2vgPkv00PXgOCWOxNgVcvd BveIuq/yn5+pCSlFkTVkv/X9WjCwGi08O0J/FMAdszxhTfMYxlfXdpCZxOLoPW+NimcDTWwUjBr L+UkK0A== X-Google-Smtp-Source: AGHT+IEdvjzHXQRmiTPCVocpPSkdF6uIWaJjq0GRNCNUep0zQF7CpSWTKGCjbHc0CcZZYOIBveH+JUOt7qyE X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a05:6902:727:b0:dfb:b1d:a16f with SMTP id 3f1490d57ef6-e03423f3a92mr38602276.3.1719434236037; Wed, 26 Jun 2024 13:37:16 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:18 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-17-irogers@google.com> Mime-Version: 1.0 References: <20240626203630.1194748-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v2 16/27] perf stat: Use perf_tool__init From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Nick Terrell , Nick Desaulniers , Oliver Upton , Anshuman Khandual , Song Liu , Ilkka Koskinen , Huacai Chen , Yanteng Si , Sun Haiyong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240626_133718_733590_7DDD650C X-CRM114-Status: GOOD ( 12.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use perf_tool__init so that more uses of struct perf_tool can be const and not relying on perf_tool__fill_defaults. Signed-off-by: Ian Rogers --- tools/perf/builtin-stat.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index d460c46f15fd..a3d77a55d17f 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -2271,15 +2271,6 @@ static const char * const stat_report_usage[] = { }; static struct perf_stat perf_stat = { - .tool = { - .attr = perf_event__process_attr, - .event_update = perf_event__process_event_update, - .thread_map = process_thread_map_event, - .cpu_map = process_cpu_map_event, - .stat_config = process_stat_config_event, - .stat = perf_event__process_stat_event, - .stat_round = process_stat_round_event, - }, .aggr_mode = AGGR_UNSET, .aggr_level = 0, }; @@ -2322,6 +2313,15 @@ static int __cmd_report(int argc, const char **argv) perf_stat.data.path = input_name; perf_stat.data.mode = PERF_DATA_MODE_READ; + perf_tool__init(&perf_stat.tool, /*ordered_events=*/false); + perf_stat.tool.attr = perf_event__process_attr; + perf_stat.tool.event_update = perf_event__process_event_update; + perf_stat.tool.thread_map = process_thread_map_event; + perf_stat.tool.cpu_map = process_cpu_map_event; + perf_stat.tool.stat_config = process_stat_config_event; + perf_stat.tool.stat = perf_event__process_stat_event; + perf_stat.tool.stat_round = process_stat_round_event; + session = perf_session__new(&perf_stat.data, &perf_stat.tool); if (IS_ERR(session)) return PTR_ERR(session);