From mboxrd@z Thu Jan 1 00:00:00 1970 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 0EA2AC2BBCA for ; Tue, 25 Jun 2024 17:28:01 +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=C5w4cInp1XYHivC3iE3132v8D/BZptpjRVHJFu6J7bU=; b=lyPfQqE1ROR8Jq0fxPAZiHu8e7 0hZKo8rmG1t0a8rFefJ8IzpDrb6xmrhb+gnjQqi3SMKXrFVHZ4QMHVpvvyPwejgpJQFF7mbL/d3bK tVNR2HOO1PljbmrvY+6oHZSD+19WMlRyuGLe/rPU+ewrb6CAaBHNSzaNNlX7gC1pY+O8JMvTBHWeM H7Mts6iqfhfI28Aq5qyK/QPkyd/z4nvynvupDPjIfZtvZdPg1ZMZxMbWsEgVGviCvQ13SdSSgNwtn YSVISHlt8/S0zIIoNIO/FmnwBjo8FP9NMtJmm6Fa9nplIM7XrkO+X/3ji9waRR6ifnSc6EC8y28yU VUDkLlPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sM9xM-00000003tUw-12cL; Tue, 25 Jun 2024 17:27:48 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sM9wH-00000003sfP-04WJ for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2024 17:26:42 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-646f6df9683so21170217b3.2 for ; Tue, 25 Jun 2024 10:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336399; x=1719941199; 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=C5w4cInp1XYHivC3iE3132v8D/BZptpjRVHJFu6J7bU=; b=LIWGvf61vvQ3qpLFs6T0krBGnf1V6+kZxG7Jnncpca0ixKlLUwyAibLWO7NkL1dLKr 1ehplZxP9AmKzY9ED1/BzGnt4L751USJn3c9RsyPwSF0iWWavl5w/cjT8MzEPCaVCIf7 3KuSQMXD4QiwA40Io3XL+xLJ7oNWkG4B3zhf/fdn6Fr63nYFgfEAeT/JbEZPN6YJKMCj TT+B0NCz2A59hFg2w5rjsEVKHCS4au3sYSVQNRm5hM4HqwwuqaFjRshgijbT2eAUX4w7 Y1uLG136sc8MAxu32CaOBjlGezh6FnVwEueCy2954ypsdcK2+NmylaV2/MXFhM/75AmS AUqw== 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=XSs0yAriO+2Ir+WzNXlMWh3XgDc/A05L3waQY56PTESDzWkVGNtx8+1d6Gbsu4hCZ+ 3Y3L9iqmVcbRne0uONRhGsB6zNSNJW3w4+GGnUiKBsyqQBoO5WdrqDnLEiCVIrhHE8rI biCM3cC+vPdTqm8xJL8U/wHej//dmt78CDec0y0WEwpjGQEqKPqbuxM3nmqSnUIcFyyv lmGKYWNwuKQDBiKV1ri74oJHLBV/xXeN40wo+ootovhGsp02blaLDFQ6SWBthiJEe3va rM7K8KOLlkkoe5FwP069yZ+t6DtTbWfJEuniuJdm/VSphN+YQytTJs0UqKkXVnk97uEW iWmQ== X-Forwarded-Encrypted: i=1; AJvYcCVAfkdY5O5/sSheNp9EQufUy7DWg7ZtCBfJXj0M9s5kTmCUYjUmRPD68ITkGxYrArShH2qK4ErtTmf2K2/b349MDq6/V8zm17p9oGOqAnmUWjL15Fs= X-Gm-Message-State: AOJu0Yy50lQUTVYKylqEOiXphPZnr16wYvUiCpXY5x8ldMPzMHznJ3oA DtgALoyuiwux7A61DACp+TH/uRFdoSyO03du71haUD6ffqM8N3IiYrD9WD/I6hG7yuEyPH5fkNN rG+9cag== 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> 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-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240625_102641_147298_6A7A1BA2 X-CRM114-Status: GOOD ( 13.94 ) 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-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, static void stats_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); + perf_tool__init(&rep->tool, /*ordered_events=*/false); rep->tool.attr = process_attr; rep->tool.sample = count_sample_event; rep->tool.lost_samples = count_lost_samples_event; @@ -817,8 +817,7 @@ static int stats_print(struct report *rep) static void tasks_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); - rep->tool.ordered_events = true; + perf_tool__init(&rep->tool, /*ordered_events=*/true); if (rep->mmaps_mode) { rep->tool.mmap = perf_event__process_mmap; rep->tool.mmap2 = perf_event__process_mmap2; @@ -1275,30 +1274,6 @@ int cmd_report(int argc, const char **argv) NULL }; struct report report = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .namespaces = perf_event__process_namespaces, - .cgroup = perf_event__process_cgroup, - .exit = perf_event__process_exit, - .fork = perf_event__process_fork, - .lost = perf_event__process_lost, - .read = process_read_event, - .attr = process_attr, -#ifdef HAVE_LIBTRACEEVENT - .tracing_data = perf_event__process_tracing_data, -#endif - .build_id = perf_event__process_build_id, - .id_index = perf_event__process_id_index, - .auxtrace_info = perf_event__process_auxtrace_info, - .auxtrace = perf_event__process_auxtrace, - .event_update = perf_event__process_event_update, - .feature = process_feature_event, - .ordered_events = true, - .ordering_requires_timestamps = true, - }, .max_stack = PERF_MAX_STACK_DEPTH, .pretty_printing_style = "normal", .socket_filter = -1, @@ -1480,6 +1455,7 @@ int cmd_report(int argc, const char **argv) }; int ret = hists__init(); char sort_tmp[128]; + bool ordered_events = true; if (ret < 0) goto exit; @@ -1534,7 +1510,7 @@ int cmd_report(int argc, const char **argv) report.tasks_mode = true; if (dump_trace && report.disable_order) - report.tool.ordered_events = false; + ordered_events = false; if (quiet) perf_quiet_option(); @@ -1563,6 +1539,29 @@ int cmd_report(int argc, const char **argv) data.force = symbol_conf.force; repeat: + perf_tool__init(&report.tool, ordered_events); + report.tool.sample = process_sample_event; + report.tool.mmap = perf_event__process_mmap; + report.tool.mmap2 = perf_event__process_mmap2; + report.tool.comm = perf_event__process_comm; + report.tool.namespaces = perf_event__process_namespaces; + report.tool.cgroup = perf_event__process_cgroup; + report.tool.exit = perf_event__process_exit; + report.tool.fork = perf_event__process_fork; + report.tool.lost = perf_event__process_lost; + report.tool.read = process_read_event; + report.tool.attr = process_attr; +#ifdef HAVE_LIBTRACEEVENT + report.tool.tracing_data = perf_event__process_tracing_data; +#endif + report.tool.build_id = perf_event__process_build_id; + report.tool.id_index = perf_event__process_id_index; + report.tool.auxtrace_info = perf_event__process_auxtrace_info; + report.tool.auxtrace = perf_event__process_auxtrace; + report.tool.event_update = perf_event__process_event_update; + report.tool.feature = process_feature_event; + report.tool.ordering_requires_timestamps = true; + session = perf_session__new(&data, &report.tool); if (IS_ERR(session)) { ret = PTR_ERR(session); -- 2.45.2.741.gdbec12cfda-goog