From patchwork Wed Jun 26 20:36:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13713416 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 7276FC30653 for ; Wed, 26 Jun 2024 20:42:22 +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=g+eUWDVM6QBZsAa2Jo8FHym45eB780ogdLDPw0XzQlM=; b=hSRE2Mcyvi2lJnUsl2t9X9nIQ1 SetpLqoFnUeyisapXm0cF6Q5MXwrJLIG7fIKvi0ESHZhMw67ZLCU1H+hP4moQJXwLxbMocpXKWfl+ RVADwzmxl+YlD4ylvSni15rKBlppyYgKL21+aVYc2pQYnHEtGysaYtC+Nk04h+WgrWINxcMKm5piO sXZwb/UZ2T+2HFa1pDrTs6B+iS9y5B1nkv16Fwk5powIKlWKhjEHmmqyEy/C2j4BT8YZGaDm+JE2I 5z2KA8DvNAOrT5pDnpurFTDZnzl4ml3GvBxlTBJbFeHIILJj4XlP1B4zk3vpS37Bwgf+zrXvOi7u8 A8TsUsMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sMZSz-00000008Hb6-41N5; Wed, 26 Jun 2024 20:42:09 +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 1sMZOT-00000008FXL-1fyf for linux-arm-kernel@lists.infradead.org; Wed, 26 Jun 2024 20:37:30 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-63bab20b9f4so127636747b3.3 for ; Wed, 26 Jun 2024 13:37:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434248; x=1720039048; 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=g+eUWDVM6QBZsAa2Jo8FHym45eB780ogdLDPw0XzQlM=; b=vMhS1NyR3HLsoLdVPBGt13Yf4vkKHzK3O+xFeqBz0Yj2MDd0PFtm6MPKm/8cTzBcxs kzX/Pn0hq6k2M923h/CWuej+mt3xiQZkKH90BJyJvKNppahbgye1O4o5Tbk9o37KjTEH fLqEvrmbGMFhs7R734+dpuU8EEokvgMBdDpGfVNmmDKNWwVN0pjQmaN8FJbGWFkqZIOh jqg14YjM50TwHvTkXOlhK3j7bfgED6E8jAfN6fQNXpdI3GL/Cu00kFo4S5m2KidI8HZe r+P3RMUyMldSXKmMq1N2Y1kbVo/akgB/3j8KsADdnNtIpN2MwFTENhskpdl4sphuh4Cz Km8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434248; x=1720039048; 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=g+eUWDVM6QBZsAa2Jo8FHym45eB780ogdLDPw0XzQlM=; b=gagD6KOclaNQwMEtkbtJ3e5UiDn04p2oxKxXmEOAI7p8WA9oHDhZqACGmxgY8zHlzh 0du92BObG3MKBDzClBE6b8YlFjdpbAr9/nTeye5AtFJQkill8p7b8KDeFB7HD1AVL7oW PB9YCPVtyBh1kt56qoc7Gnyey24ZOB7syyES0a+nwdcE1JbEgebruqaDPh5sZztQDx16 Hvi4y1dHOyZIMkmyYkWoWNAOIAf74pIbI5SGcrootGXxspcHyLNlaNMDd1hnEAx9KKdt afsYFIOTbrggkB4LlP0OpxNWM76fuYWoso1fYE2oVcvdlnava7bzy/Kyd2VfPX45vnIN 0M0Q== X-Forwarded-Encrypted: i=1; AJvYcCU5Z0xiwEpxu+J7WSS0qOknjg6DHiWNZwUZwwA/wCgcqv6ROsTu87NnnoT+kEW+/FRbhEbR2GpWQH4YSYpa0Theb2HbjK2xDOZicTluSpeOkEwAANQ= X-Gm-Message-State: AOJu0Yz5bc6ybV4ski5rQTKeai2HIHyFIlC8ao3uJhuHuXF580uiaZRf nW5dSvTE1s7t8foXACcqVdde5yV3pwdEjO47URUbGxhAbXKMxkS62i12E6gRWygmSICg65vBjCg f1EICTA== X-Google-Smtp-Source: AGHT+IGK7lEMZbXEloyFcWkWnNtovrkJgcXd3lNq1ruLQ78TDJ2ALy68c+95Mra/WGL6eiCxX23BeAO5lDBd X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a25:dc84:0:b0:e02:e1c7:6943 with SMTP id 3f1490d57ef6-e030400522emr31542276.12.1719434247639; Wed, 26 Jun 2024 13:37:27 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:23 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-22-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 21/27] 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 , 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_133729_546785_AE06989F X-CRM114-Status: GOOD ( 12.88 ) 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);