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 36CBFC27C4F for ; Sat, 29 Jun 2024 04:58:31 +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=0v3fokev8dqp3wp/KzvIIEo7fWRsPgHRVVSDRon34u4=; b=pmGyTdXWFdUOPxhk94RzR+MuQJ tUauTyq2xVGCFAIzmyu1xS8yyyKjDUSp1VA7ntuIhXJe/rVF9DA+ljbaG2TF5bygQQUKBQ08fVLCe I4bH+W7fiEnHpMGQodROr6CnYiySWCKGwSd21JHUbsGsmCz5KTUs2biz7rm9Io6RnsB423n2brza/ pC64Z40p4emTRsQ0eDb7E/Gv7KzXSyjG5AlaLH81sbQ8WIOsNif0Z/HKZUMtoXwf4kQOiufVqpzgS CsHQZAvaVCrsIbWKfRFIlrNFsqmpS2hsLO67Fdvo2ii+CuhI0EzEHRHupF++K1rjb07pBrXFzkXu0 lRa2OoZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQAE-0000000Ft9G-1wuf; Sat, 29 Jun 2024 04:58:18 +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 1sNQ71-0000000FrSh-08fF for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:55:00 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-e02b7adfb95so2311687276.2 for ; Fri, 28 Jun 2024 21:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636897; x=1720241697; 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=0v3fokev8dqp3wp/KzvIIEo7fWRsPgHRVVSDRon34u4=; b=XQ3/O5zsOy1xJZYKRLW6PGIHxb/CTTAOGmRjUuTzitrCrwEMJkrNnjCMNq99OBGNDm DFq30zstZ6lVhspYMzq/iIWV+5laKviSpOMpwFnnNttNgMun6hxKf0ZXsTHvcc/5NWkh SnaXbYkIlJiEg14hj50wG9OE7kNy3j39ha9sFFjgJpdqkkQuOGkUAktyMLQxHlCbI8sq SRRGQvX8UCtcuOHl/B4wOnfAYqScFGCmNusGYBgWe+nbzbhnzwP96l5+CFgyURrTLmA3 wsNJ4rswWqwpPX7eg6jBwiIPr4QrMnI7sF0OqfpSSG/IbFPLhtxBmxpEKdnUAj+9sVwS xipw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636897; x=1720241697; 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=0v3fokev8dqp3wp/KzvIIEo7fWRsPgHRVVSDRon34u4=; b=hLolIx99gIz8q1bOo3otPCXs6k58RWPQH9LFTMR95H6ElE8u3GnDgXDrgdWuYqXXNA ru4D4h17Ia5FNR/dfYE5Sg/YikVOrFJiqU4Qaqzz6zcqMi4InqsmAvYYLgtmFFps5H5X hLqZokVhUVDGJXUXuLppWelA6qIqLbbYs/It5ThoWsAEXvhNbwgCfn9bPR0bp9x5rvSW BbFSjEF60p6dzeWCEPj5cUXmWXXmrlgqG71LpsIXc+xHp4wjE/gjKXncLNGC+NtyRUbY 3zgEDl9A+geERdDRTDoU1iWCNqEO8hNxj1TxcXi2gel06M6/r9TG99ewn8F1vqwFvN/h Ba+w== X-Forwarded-Encrypted: i=1; AJvYcCWucSkly6o3nMHx5g4ZKKIq0150sLAqhRNMhtBVdJrfWQJ3/hedCwl39VREipj1lv+1Bxmw2ZFw1u2SscJ4gZPdAs+BfwkhkJUlKo8uHmNM8flSo9Y= X-Gm-Message-State: AOJu0YyYr3t06692xNEgQnDf0geBBK3NDvinmamHDA22nSWxpSV++rCn 71RO+FM7sMNYOaef4r/aqXhwC6rekdN9x+JtW8dR/9ix/xucMnEn41AZp2e4H4XQ14Lcm3lZkbz 86v1uKw== X-Google-Smtp-Source: AGHT+IFebbTbrBD46jrbbAKmEiQhr8CIpwzw2fa35jGiBLO5MmgTjOTYHAA/dOn6kgN3PXW8P1kNAUf1baWR X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a05:6902:724:b0:e03:31ec:8a24 with SMTP id 3f1490d57ef6-e036ec2e117mr860276.8.1719636897584; Fri, 28 Jun 2024 21:54:57 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:44 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-23-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 22/28] perf diff: 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 Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240628_215459_121743_7969AB1E X-CRM114-Status: GOOD ( 13.18 ) 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-diff.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 4c0567882a7a..28c5208fcdc9 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -467,21 +467,7 @@ static int diff__process_sample_event(const struct perf_tool *tool, return ret; } -static struct perf_diff pdiff = { - .tool = { - .sample = diff__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, - .namespaces = perf_event__process_namespaces, - .cgroup = perf_event__process_cgroup, - .ordered_events = true, - .ordering_requires_timestamps = true, - }, -}; +static struct perf_diff pdiff; static struct evsel *evsel_match(struct evsel *evsel, struct evlist *evlist) @@ -1959,6 +1945,18 @@ int cmd_diff(int argc, const char **argv) if (ret < 0) return ret; + perf_tool__init(&pdiff.tool, /*ordered_events=*/true); + pdiff.tool.sample = diff__process_sample_event; + pdiff.tool.mmap = perf_event__process_mmap; + pdiff.tool.mmap2 = perf_event__process_mmap2; + pdiff.tool.comm = perf_event__process_comm; + pdiff.tool.exit = perf_event__process_exit; + pdiff.tool.fork = perf_event__process_fork; + pdiff.tool.lost = perf_event__process_lost; + pdiff.tool.namespaces = perf_event__process_namespaces; + pdiff.tool.cgroup = perf_event__process_cgroup; + pdiff.tool.ordering_requires_timestamps = true; + perf_config(diff__config, NULL); argc = parse_options(argc, argv, options, diff_usage, 0); -- 2.45.2.803.g4e1b14247a-goog