From patchwork Sat Jun 29 04:53:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716796 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 015F8C30653 for ; Sat, 29 Jun 2024 04:57:02 +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=JwYcrkEXaidwd4Z5roU7UK2PAYIesHAmyGq2F/bho4E=; b=UdbMBkzwAayA5JlbchL5bnFU6p OE2x7wJIDqoYOb6UL6bPxqkOQJSKroHGnxzOAI7RRLDMuL+KpPP/JvpA9tZmpz1oMrZNsAeLCfO/+ mKk9c84B55NscXHUxRvJWyKEghutCYD36zNUamIi5jvU1bVNBG7KJkV4ew5hg9krLnJzoS0O8I0wx Ybh+qa62mhSky0FgPaoUY+FLN49U0nsE6xi7xpG3Vo5Lh3tADR3LewjHQvv3OMv1t2ByD9vBIaK2Y XqOyyXhURIswxLS1RDSYzZ9O0uPGBT4rNbQufHnA2z2I3h9zP87Q1msvUS2GyuAWrjRetB0m+ifFL y6ZWC9bQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ8o-0000000FsKR-3STv; Sat, 29 Jun 2024 04:56:50 +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 1sNQ6n-0000000FrHA-2Hww for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:54:47 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-643acc141cbso14180187b3.1 for ; Fri, 28 Jun 2024 21:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636884; x=1720241684; 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=JwYcrkEXaidwd4Z5roU7UK2PAYIesHAmyGq2F/bho4E=; b=Vu1KLrbWpwz9s3i9PWnpOL3uRULUS+u9AqZyjq091U6SoCwVNDdUbRBEuxXMwBtF5B LDTGUHmwqfm2Y+jPJb3/JxbpJOl+bL3mKEP0uW9v4sfw+fiTUsOqchFDsbHiBHDJg/u0 yS7acjQ/Lxkbc9HgNDqjFJnjxkUA30usk1Kyw5Aw4iq5xsJwLOtUT/gO+pN599laZsq8 UlDDfhXNM69j4cZx2ugteAkyoQFcDPFJNXEFi46z3sEeDnPXVDv1sL0Nu73NWSdU9yZ5 CW0cHwc/um1O3xckcTRsiFW+ZUWa3XtmJNPWjlECwxi657bON8q90bCyTTd+njiUTWVG M0ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636884; x=1720241684; 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=JwYcrkEXaidwd4Z5roU7UK2PAYIesHAmyGq2F/bho4E=; b=PTB9TM+iSXAByRfLSVqgDYpPWrTRdMIqvs8WIVG90mHE6IZLgm+FE02DGBIaCIPgNv II9ImO+EYxShU8XqaWm8aGVL6lqvDrjjjPErHWV7bIRjp1UtsswT3SrOz982HUsI5RGE JpBCM0+Z7MNe9j4H5tb9GAxIFleXCsnZ9KMKBFWGDkX/l840sJqo3dFdcOTGndi2wuvv UCr0OedHdE4KHI8KK9Fpnj6K9YYh/hFlGnyHQJaX4tGV1I1bbbF8uu+DgfV8QoZvyOjQ usO2buK+dhCXVlAhTTkpfoP8ww21kKoUW+xEs2InY4t5z41RrSqG5IfVMEmDb5Lb+pUs S5QA== X-Forwarded-Encrypted: i=1; AJvYcCXPU3caFdul/lczB+SVPabRV4mKS5kjFjEVsOAlOpn76CnU4TwDfVa6LF766Ku7oG9B7Oglfq7VeycaF45+pHkjPshhdjJ4s0b/ciSorMSOjXkaAmo= X-Gm-Message-State: AOJu0Yzw3KCf0dpSPUjA1i5rYIr+1xvj2un+ajOn+LnVP6lLapf3yEsB 1jH9TSVDvCPfrpaRZErM4fXFr9b5qduP4nMYI2bi+6np/3+YelUAYO3ZSS+Y3PJUqvUsMPj1kQD IW5sPyw== X-Google-Smtp-Source: AGHT+IFoH1LQLq/Q7zXZZNDrbDM7uUS6jL13oj5uD5gOMYkfL3tHUvM9RMCDuhIAY6WBZpQ2ynmy6kqUusL+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a05:690c:7647:b0:644:c4d6:add0 with SMTP id 00721157ae682-64af3134c36mr462217b3.1.1719636883810; Fri, 28 Jun 2024 21:54:43 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:38 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-17-irogers@google.com> Mime-Version: 1.0 References: <20240629045350.285243-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Subject: [PATCH v3 16/28] 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 , Athira Rajeev , 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-20240628_215446_022311_42F5FBAD X-CRM114-Status: GOOD ( 14.03 ) 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 2313bacea0d2..86501edd5a7d 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; @@ -1273,30 +1272,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, @@ -1478,6 +1453,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; @@ -1532,7 +1508,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) symbol_conf.skip_empty = report.skip_empty; 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);