From nobody Fri Dec 19 07:01:55 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C9AF17D8AD for ; Tue, 25 Jun 2024 17:26:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719336402; cv=none; b=ZZJINJkxRaVHtZwnaIQSevz4D0l0I9jS7Qljr01QIEN652bayAFsNj4RWV5glsBi4v57EUInNWe1WqyQtqhmecX3bnviV0TQfoV87CJVX3nMq6XJVDerJA8rJzpMVbhfMu+cZxxKs7PH6OLirgddXVP4bBUpX9uPUKdvsAR7Ws4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719336402; c=relaxed/simple; bh=SsGbey/lX0PF3u/QexDBtDo9aclN8M23kQ3F/liEyeY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=VmqurCYfk3mfxOGEIm6SVGKLgeEasFtYmMgmGge8o1LjML24vZ/Z9aZOIh1oUhDLgncL3saClIouswejc7bJn4JVGyXQ0yHFXqf/rnpC3G7xCbHCs2+3WSenRECaOVhDs9Dj2BZLbXslMbYYi5Eg7+YH55iFihpL44NlbuGipYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=MShDCt7+; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MShDCt7+" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e02bb412435so12327345276.1 for ; Tue, 25 Jun 2024 10:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336399; x=1719941199; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=C5w4cInp1XYHivC3iE3132v8D/BZptpjRVHJFu6J7bU=; b=MShDCt7+QiQVl5fgi8dsITRDPiPjyYKsUhYcgqD0tIEwsf/ITA2rJVIax2CF2H5OMw WLnzKE8bHqBgXVD1D1r5g1rvzC/7csV2NEVlq0+mFmDLhOdZH8tqk/Kc2D5yN8qrkYNH TcfkynBXhlWWQQmxOPigPJoccnXpRipXQmhNsZljr9MTqgM9ASZEr10DHwjhCqSrkcGA nuCTZCjHGGoNKkO6DB3+3ST2JyZp3IWElZnfic//bnha4dUUqgY/5FBC+3MPtzNGydiM xyMAhfsIhncMhKkBjbFhdOK5u0vBqvclIVajmGZLAoVGz4XD0Qy6RogULYOjT+xVoAyk jqyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719336399; x=1719941199; 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=C5w4cInp1XYHivC3iE3132v8D/BZptpjRVHJFu6J7bU=; b=abrnkumdmQJ7CmJWJw1EC6kVcR3mtO39KyQUhPaTTOQWfa9+NzET0utWCItPSinbix uWhoXnCnFq1LJqBUHo4cB7XzdzzMPiQU8tm7rUPUAZaVleKRZn/jf1pL4f+AACse4LHi a/81Y4gocl5nJXEelRhkWsXN10Z5CFiT99HlMaZY/zl/DWyf8Xdv4uto76d9UMxh7hZU kfVt+2BiH7Oisg3v5KHgoklIL34KoEWKG7QQMUai67/i1H86eJtgErpbeqnKQKn69Uoc OdEuT39MzVwKzUDpqGE5i/du5PolCavUnm9Ue0ZyLEAuBKc1IJ5sMpJqmg6jqs/w0aem lkxg== X-Forwarded-Encrypted: i=1; AJvYcCW+21pvVT5kZTDOjwqBkXHiYCQd4AZaAi2tABx6QeKICi3TvB02b0tHGV2RIS9tti6tPwFKYlfS2bOPeu6DTHjWRTtbN7iHi4rENCL7 X-Gm-Message-State: AOJu0YzSiWBKmNrp4mj0mU74KVOtz0i384aP9Qt8ESaHbDCX3S1Ep6LX bu275z8YlntZIlSMP7j2PI3KeO2S/6JLyaj3Zh64zSvW8xNrlskk4LFEcaB4zrJYEAVAHqmUPiA FXdsHwA== X-Google-Smtp-Source: AGHT+IGkNnzupWAe2VlADESO5lg2+CTiWH+MH2liE+/EBrEEqIPx7BnFuqYzgLszQiwG21XCiljDeffYYpww X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:6902:1885:b0:dff:49d2:ac42 with SMTP id 3f1490d57ef6-e03040be235mr417284276.8.1719336399148; Tue, 25 Jun 2024 10:26:39 -0700 (PDT) Date: Tue, 25 Jun 2024 10:25:50 -0700 In-Reply-To: <20240625172603.900667-1-irogers@google.com> Message-Id: <20240625172603.900667-14-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240625172603.900667-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v1 13/26] perf report: 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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-report.c | 55 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 947d4a9c9f66..029e5c35632f 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -799,7 +799,7 @@ static int process_attr(const struct perf_tool *tool __= maybe_unused, =20 static void stats_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); + perf_tool__init(&rep->tool, /*ordered_events=3D*/false); rep->tool.attr =3D process_attr; rep->tool.sample =3D count_sample_event; rep->tool.lost_samples =3D count_lost_samples_event; @@ -817,8 +817,7 @@ static int stats_print(struct report *rep) =20 static void tasks_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); - rep->tool.ordered_events =3D true; + perf_tool__init(&rep->tool, /*ordered_events=3D*/true); if (rep->mmaps_mode) { rep->tool.mmap =3D perf_event__process_mmap; rep->tool.mmap2 =3D perf_event__process_mmap2; @@ -1275,30 +1274,6 @@ int cmd_report(int argc, const char **argv) NULL }; struct report report =3D { - .tool =3D { - .sample =3D process_sample_event, - .mmap =3D perf_event__process_mmap, - .mmap2 =3D perf_event__process_mmap2, - .comm =3D perf_event__process_comm, - .namespaces =3D perf_event__process_namespaces, - .cgroup =3D perf_event__process_cgroup, - .exit =3D perf_event__process_exit, - .fork =3D perf_event__process_fork, - .lost =3D perf_event__process_lost, - .read =3D process_read_event, - .attr =3D process_attr, -#ifdef HAVE_LIBTRACEEVENT - .tracing_data =3D perf_event__process_tracing_data, -#endif - .build_id =3D perf_event__process_build_id, - .id_index =3D perf_event__process_id_index, - .auxtrace_info =3D perf_event__process_auxtrace_info, - .auxtrace =3D perf_event__process_auxtrace, - .event_update =3D perf_event__process_event_update, - .feature =3D process_feature_event, - .ordered_events =3D true, - .ordering_requires_timestamps =3D true, - }, .max_stack =3D PERF_MAX_STACK_DEPTH, .pretty_printing_style =3D "normal", .socket_filter =3D -1, @@ -1480,6 +1455,7 @@ int cmd_report(int argc, const char **argv) }; int ret =3D hists__init(); char sort_tmp[128]; + bool ordered_events =3D true; =20 if (ret < 0) goto exit; @@ -1534,7 +1510,7 @@ int cmd_report(int argc, const char **argv) report.tasks_mode =3D true; =20 if (dump_trace && report.disable_order) - report.tool.ordered_events =3D false; + ordered_events =3D false; =20 if (quiet) perf_quiet_option(); @@ -1563,6 +1539,29 @@ int cmd_report(int argc, const char **argv) data.force =3D symbol_conf.force; =20 repeat: + perf_tool__init(&report.tool, ordered_events); + report.tool.sample =3D process_sample_event; + report.tool.mmap =3D perf_event__process_mmap; + report.tool.mmap2 =3D perf_event__process_mmap2; + report.tool.comm =3D perf_event__process_comm; + report.tool.namespaces =3D perf_event__process_namespaces; + report.tool.cgroup =3D perf_event__process_cgroup; + report.tool.exit =3D perf_event__process_exit; + report.tool.fork =3D perf_event__process_fork; + report.tool.lost =3D perf_event__process_lost; + report.tool.read =3D process_read_event; + report.tool.attr =3D process_attr; +#ifdef HAVE_LIBTRACEEVENT + report.tool.tracing_data =3D perf_event__process_tracing_data; +#endif + report.tool.build_id =3D perf_event__process_build_id; + report.tool.id_index =3D perf_event__process_id_index; + report.tool.auxtrace_info =3D perf_event__process_auxtrace_info; + report.tool.auxtrace =3D perf_event__process_auxtrace; + report.tool.event_update =3D perf_event__process_event_update; + report.tool.feature =3D process_feature_event; + report.tool.ordering_requires_timestamps =3D true; + session =3D perf_session__new(&data, &report.tool); if (IS_ERR(session)) { ret =3D PTR_ERR(session); --=20 2.45.2.741.gdbec12cfda-goog