From patchwork Wed Jun 26 20:36:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13713404 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 19E94C27C4F for ; Wed, 26 Jun 2024 20:38:59 +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=6guPMXmcdW65GtfPCYKyOHBofbB3BqlsDiMCqc1Wqps=; b=AfurLxILtprvK6IpBoKD6ZbRKJ lY2p1au448Xe+bHZJUxK0L2GsIRhfyDJ0c/J4eneIACM7kzgoJwB4h/as0AVIhjDmtbDpKpIlr87I uvLc2kZrQn74p/Djn3XEjrnxZUc/Zb1DdStyOoJcHagOkxZsLAhJgPqmj43ogG0jggUET6X0UwNWo yxfzgDHyzTok2cUiYUVqQXn5qd6JiE1+P60QXKyxt4sffb5HZXx251nQdzBYl39LjaL8es8jRg19X WyZdwdWkILEsymJkMkvSzqFT0XFNBNgpYkPpjV07q048MzRaZkp8wFn8AsLXo4eszvztajU5qnH7b 9lssbqXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZPk-00000008GFH-34UJ; Wed, 26 Jun 2024 20:38:48 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZO8-00000008FIw-0i6f for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 20:37:10 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-dfe4f388d33so15129134276.2 for ; Wed, 26 Jun 2024 13:37:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434226; x=1720039026; 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=6guPMXmcdW65GtfPCYKyOHBofbB3BqlsDiMCqc1Wqps=; b=MQw4otd7khX415PneFpylo9R1sWvvo48AR3PGHMVdVei0wWo/G4lwtw3ULv53WMymu zOsatQ5RlkFrcsj+s5b2RdjwREGwcOZtdtnQmSuwZizQJJFpMDQziJz47InWoVh7l/dB euLqRxheVGAyV72ty0OjCwcSMrqklr1q4v54d9RNBvstVo+ONwk664qS4QU4bffoAx4X RYBySQxo7+xZ0kXS02B/4OKIa/etOWQZKGGXN1DvKGNALq+CkA2usdzs4hNFD+bSdheY zE13AcHPaMUzoU6X7YTQUbBVeyUGVPBS4FY2jzhvqZNiAkq5MK9iSdV+ce+xxCv++ZWE hv+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434226; x=1720039026; 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=6guPMXmcdW65GtfPCYKyOHBofbB3BqlsDiMCqc1Wqps=; b=wr4dwS0JuuOay/rvTuVw4P5FASQa5gy1xAi8ma1hDFdHHc4YrMb1G0JdXY6o/Fa/mR kc+Kj4A0CQezPYWmURXCaXuj6pbat92vjdyJrGsHFtfQ1BOom7UO+JpyyzFG1UmiHT8U USJLBL5sbhvM6tAxClY7QOJaGYDTGCZdGHB+Hz39eKgn/+tuQmjnu1DgA2D6LW8gW3Vb qb3Jkbg6Xvu2Vv0QO7LTT8Qp2XKaaxxqc0F5iMKk2MQPM5J6zWYyVQsL4NnG5LE5R+sQ YD3imKXRn4ACK1EfbKHO/F6WW952jWxhQqA+j5gYGZ4Nj0ziW21pJTD9PF3XzF+EIZKs 7Mig== X-Forwarded-Encrypted: i=1; AJvYcCXvYq7rLDYk/TpV6KbYdsR9Nt2odVurmTfI4wMxFmueviqdvhh5fpO0gYqkwlJGnxTj2GFO9aFNSPPEV2Zjh3dImQHePtOpc6Z2wjmvprV7EmT4jQ8= X-Gm-Message-State: AOJu0Yzi2qBVYS+smxXk+ySTm8IqqtMj6pnE2zOeYdArlxq8padDG2JS WwjFixAcy5Mu29YaU8+PIluGJjlzrurW9JPLVNesqfsm/y8t1kWBltm4r5weQ1KUMR2t4p49vfI tU3aHSQ== X-Google-Smtp-Source: AGHT+IE4+2WDwaOh4Ud+JjaxVM0mGpm4/Kn91LBXC8OyTMn8BlzeCAAbjSSYQBawrYF1H1vHwId3MHU2iRRz X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a25:e056:0:b0:e02:bdcd:3bd4 with SMTP id 3f1490d57ef6-e03040e5ea3mr359356276.12.1719434226584; Wed, 26 Jun 2024 13:37:06 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:14 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-13-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 12/27] perf c2c: 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_133708_278633_BA67BB25 X-CRM114-Status: GOOD ( 12.23 ) 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-c2c.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 88c131d05186..cd2bd573bfc3 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -385,24 +385,6 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused, goto out; } -static struct perf_c2c c2c = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .exit = perf_event__process_exit, - .fork = perf_event__process_fork, - .lost = perf_event__process_lost, - .attr = perf_event__process_attr, - .auxtrace_info = perf_event__process_auxtrace_info, - .auxtrace = perf_event__process_auxtrace, - .auxtrace_error = perf_event__process_auxtrace_error, - .ordered_events = true, - .ordering_requires_timestamps = true, - }, -}; - static const char * const c2c_usage[] = { "perf c2c {record|report}", NULL @@ -3070,6 +3052,19 @@ static int perf_c2c__report(int argc, const char **argv) data.path = input_name; data.force = symbol_conf.force; + perf_tool__init(&c2c.tool, /*ordered_events=*/true); + c2c.tool.sample = process_sample_event; + c2c.tool.mmap = perf_event__process_mmap; + c2c.tool.mmap2 = perf_event__process_mmap2; + c2c.tool.comm = perf_event__process_comm; + c2c.tool.exit = perf_event__process_exit; + c2c.tool.fork = perf_event__process_fork; + c2c.tool.lost = perf_event__process_lost; + c2c.tool.attr = perf_event__process_attr; + c2c.tool.auxtrace_info = perf_event__process_auxtrace_info; + c2c.tool.auxtrace = perf_event__process_auxtrace; + c2c.tool.auxtrace_error = perf_event__process_auxtrace_error; + c2c.tool.ordering_requires_timestamps = true; session = perf_session__new(&data, &c2c.tool); if (IS_ERR(session)) { err = PTR_ERR(session);