From patchwork Wed Jun 26 20:36:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13713415 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 67ED0C27C4F for ; Wed, 26 Jun 2024 20:42:11 +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=6FKqc617GU6y9EZBzym/gHkh1HBEMH2nzxihyAHq3eE=; b=r3PGvwhTD+zV4rLSkIC66Df+Fh OdPE/lpoL7dlEEI8OU1snItkJwGH3Hga3bHgz3zoYS2Rq/KMGCL/t6lRB7mCVHHWnhRE4do7nDToK O5cqccp8TPhBDKkbhJIbcUwzEDfUVHdmKLUKPzGO+JHUJHYW4wRMDSdwVnCOLIyX+iNkzYMDijhoi pfG/+XyhPuqKkBJy11327mgLAGKAjMuPfKkj8V7JANxtaAIPZHOO1iW10Jit3+2+VD4WYJ3jNUM8h FgU7GV1hLj60VCp85qrh4R/rv58A2sHx8jBCP4Qx5BsIKPULDKk+k0PpIBrilxp7M93pkaG5Y8eOv 5WxgUSvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZSt-00000008HWq-16fB; Wed, 26 Jun 2024 20:42:03 +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 1sMZOO-00000008FUX-4B8o for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 20:37:29 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-63bb7fb3229so153581747b3.2 for ; Wed, 26 Jun 2024 13:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434243; x=1720039043; 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=6FKqc617GU6y9EZBzym/gHkh1HBEMH2nzxihyAHq3eE=; b=cZVSwurrOtGiKAjIE7fskoVWYBnB7kl/lnCela0Ia0y4bLZFssw6HhjenX8xQLWvcc Aw0qVU5oiUXE/a6j5Cdp410vqQXlpbRfbwx8km56MDrmmDaCh8oF+6zZ/+U+JRwyQ+jy MCSMVph52okhC7zP3VpFRuwVf7NuXoqGcGn9kSY+kZwsrkFG+V5F5mVNFGgQeJek9XWt oHQLBFsYWBy5HcQnsm1Y2winiCl0xlpv+oCkgJJB8/qxtrN6tsIrHG+TrhF1+iACEvt6 GBt8NSLk9zviQziRteP54916+rIue03URm20JaAxOgkNkQ5asHascx75ugdedneCJnk4 Elpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434243; x=1720039043; 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=6FKqc617GU6y9EZBzym/gHkh1HBEMH2nzxihyAHq3eE=; b=H7sz9LZN+9grWigTIXHzuz/+ktgYsDiodWoHTryVzaz1QD0Jj7ID2MIZuQ1STtogBi 70xbaWsizqsW3t280X+dq3DUV4MQLk1X5thIwTVZXgCcf+8xnM2dvmFprDYJVy2gs4DM MAVW1KjluN5pFqdkLQ9MHDfORJyGwT+dbnI5348XoiE/PiSgG0+o4eMW4wSWU5cxXUVM ytS/+jsYdSczig10ZLQPWLZNI/a/5anTM2D0bt4QHG3/jp43lkU/K0bDMSNHZNA6u9yc 4dJgfiQMMyzbQLbnkDQ8kTRi0zupbjalTDJ/zf9pKPpFE12v4nVAkngLtoJ+SoaUDDZr j21Q== X-Forwarded-Encrypted: i=1; AJvYcCXeU9YAbbkhjtH86EcAr5ukuSwurOw9KCoSiI7AajAh/eRkuIEPerz+xgz/QV5uRHcWJPCluq8siBg41EjlZGQkVV7FzhKdPCrdlzMSfXMW+iJdndE= X-Gm-Message-State: AOJu0YynIJkcJ5M34bxQBD/9BjOiSZhqAHK0qjhKlbETex9E8JDfuRMl ju/3Kds7h5liO12HAchM2JkMu2m7dq/ZxjlYiGlE0nQjHO8NPMCC5b2/foKFKHxF4RnV7TaK9lU bdTlepQ== X-Google-Smtp-Source: AGHT+IGZ2cbOs+APOfGf2ySj3i2AIMZztj3b6qdJV0HjjCy2lYFBRVoy2+uVDxJhN+goCOCz1d2W7vXHAT/x X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a05:6902:704:b0:dfb:22ca:1efd with SMTP id 3f1490d57ef6-e0303fce998mr564006276.9.1719434243104; Wed, 26 Jun 2024 13:37:23 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:21 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-20-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 19/27] 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 , 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_133725_043951_4731FE18 X-CRM114-Status: GOOD ( 13.15 ) 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