From patchwork Sat Jun 29 04:53:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716800 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 DBE6BC27C4F for ; Sat, 29 Jun 2024 04:57:38 +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=NfKlTlSCL2wXPfCkyXXt0BLFWNYsoBhoMOQYtSMfZQY=; b=bmocUeZeKeXFi4GBKisXhKRawP U2WYiciGVmAfLGvHXpDk37TdyM4TSPGmWJhjD0pcq0d4OxO+y5zWsdnxhMLavAw3gHywGX2FXEwgR 6E1P7B/n7nmzRZlYsB6v/ddKLXeK82sWJ5BGaWMQaD9S/uvMQPy03724olkBWITvZUQe27RP7Z+3k bSdK7y8LZBg+NH4jy0HLzvHoEsH/ylIhjTe2ijdMytlRli9LiKyCgGKrdORFkxyOPmlOW/mTj6+9E 1X8lZU61Y+JVIIRza1un8f7ChmOy3jB0snFxzKvhyhYQpCzM9Wtm1ycbWZ5gr9sIADRUa5D0+76zQ abkQetgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ9O-0000000FsfG-3MRM; Sat, 29 Jun 2024 04:57:26 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ6w-0000000FrOH-0fy8 for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:54:55 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-dc691f1f83aso777741276.1 for ; Fri, 28 Jun 2024 21:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636893; x=1720241693; 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=NfKlTlSCL2wXPfCkyXXt0BLFWNYsoBhoMOQYtSMfZQY=; b=3FRoKHBf7BE19vwTaT7OAhpeIXl6Twzmxajh5Aa1bhvTNjTha8XdYB6b8GK4vtyYkN slKsf5x631DVFMcvyDsu0zbYKmzndIOnVnAJiVL1PcWpSAL5FmHxSsI7om/guTSr1RDs vybQ+EykedVVE1jHUwwzQw+F6rY9iZVbZohkM+2mqTZqyYCCAcUrEeFTZPmRMV69NKwF PURQgfyLQcfioE43trsNHjdFQIrU5qAw9qzsGRhhKphXU7n+WFhK6bLei71vslkN7B9p cYonemgDtNqFP4hK9WiOg9gm5CmAm2N7Ww5+YzKcA2e1lfHEfqJA88kjJsSsaqbJtU9J +ECA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636893; x=1720241693; 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=NfKlTlSCL2wXPfCkyXXt0BLFWNYsoBhoMOQYtSMfZQY=; b=GbYFntvxs8VLRH4tIo/NmlBcjGxrHQor0zgO2Ij6T/cbyq16Dwlu1EQ1CdQhGHAjTa UXipQy4IIMroMisnawKo1PxD0BOvIoy2H+djnlURQnwfWR+MoBOxcax73eTl5FVLEmmL tMD5M+z+5Ga65xFGqFEHpxQ9dk0p4IOkBdPAMpBemXH3ar42BEGOKI1kfouOMccrXOSw 49ZE85lXDMph9GdwDO1cx2nq3lQHgC4RdzRZBMRj90RgVIcyI6zrm2wCuHlixxPuiZFh 4tdb8R7KwxxT4Naij7VbSlJ+rmLZv5bLibyHPQt8R6aE/++66+zlm71Ppfs2qqiCHSpS xbEg== X-Forwarded-Encrypted: i=1; AJvYcCXrQp/kaUMU8xrBmYy1Q99mPVxH2TjH9xfWLW1KaS51AAUa3Ic7Pw4jU0anTEBF1ORnuvsqXd7lIiLL/uXbV51uui8h6vNeqfgPljlv3cLvbb7/zXg= X-Gm-Message-State: AOJu0YysZ/s986MXvzSkF9WHEvl8gNFsx9nB8KDrO4QQCpqB2LzFfAXx E2GEXYM+YU30fOxVwFozQY9jTfemptJHiCfvKMePatbqXOk/JcG8bh6h3Z2zCZVws3FK2VkknyT mRfSu/g== X-Google-Smtp-Source: AGHT+IE3hvUi65nhptsIwThb+FEiJVyGB6CGhV5lHcENJmfmi33GBQd2LxbemtNkGqQcGwOe83UOXGl8G96S X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a25:ae83:0:b0:e03:6445:8ca with SMTP id 3f1490d57ef6-e0364450e73mr75710276.2.1719636892995; Fri, 28 Jun 2024 21:54:52 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:42 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-21-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 20/28] perf mem: 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_215454_231715_9419DA13 X-CRM114-Status: GOOD ( 13.44 ) 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-mem.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index c2038a32543c..c12ca0ec1237 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -285,7 +285,23 @@ static int report_raw_events(struct perf_mem *mem) .force = mem->force, }; int ret; - struct perf_session *session = perf_session__new(&data, &mem->tool); + struct perf_session *session; + + perf_tool__init(&mem->tool, /*ordered_events=*/true); + mem->tool.sample = process_sample_event; + mem->tool.mmap = perf_event__process_mmap; + mem->tool.mmap2 = perf_event__process_mmap2; + mem->tool.comm = perf_event__process_comm; + mem->tool.lost = perf_event__process_lost; + mem->tool.fork = perf_event__process_fork; + mem->tool.attr = perf_event__process_attr; + mem->tool.build_id = perf_event__process_build_id; + mem->tool.namespaces = perf_event__process_namespaces; + mem->tool.auxtrace_info = perf_event__process_auxtrace_info; + mem->tool.auxtrace = perf_event__process_auxtrace; + mem->tool.auxtrace_error = perf_event__process_auxtrace_error; + + session = perf_session__new(&data, &mem->tool); if (IS_ERR(session)) return PTR_ERR(session); @@ -449,21 +465,6 @@ int cmd_mem(int argc, const char **argv) { struct stat st; struct perf_mem mem = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .lost = perf_event__process_lost, - .fork = perf_event__process_fork, - .attr = perf_event__process_attr, - .build_id = perf_event__process_build_id, - .namespaces = perf_event__process_namespaces, - .auxtrace_info = perf_event__process_auxtrace_info, - .auxtrace = perf_event__process_auxtrace, - .auxtrace_error = perf_event__process_auxtrace_error, - .ordered_events = true, - }, .input_name = "perf.data", /* * default to both load an store sampling