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 37D54C3DA5D for ; Thu, 18 Jul 2024 01:07:49 +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=86P6lehyXq0UCz+szOa7LpHKfu0TP8+WJUv3yJsN71E=; b=actlRBv4rnCfJPyVivRHjEHxh2 ZvEfqF9xec+4gLNh3zUGYCCRWNk9D+Cfhc7APmS6Uqk4TT4dl87iJ02lfJhGo7KmANYUmMf6ceYDP 8oDrzLAhreHunslPuAkyaTtGXVe/2nLqKERbrRwyWHopFYQyekSK8l6L0jvXq77wHa4x68xqg+tTh OQT2JJt61YLL3YRHJ1JyJ+sboyRb4zYTo5rp/cedl/H9TWNePKCKIoA7jg54MfH9t+1bHPuinaxV2 bDrCi32/EDmWU6fUSQv2Y7xi9TqGD2NuxtIAJZYAUjcsCmfNm8Dj7IGkgeyZ9MNgbo7xG3iosgYM3 IuKjGB9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sUFcL-0000000FMDx-1LMB; Thu, 18 Jul 2024 01:07:33 +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 1sUFWQ-0000000FJo0-2v9k for linux-arm-kernel@lists.infradead.org; Thu, 18 Jul 2024 01:01:27 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-65ef46e8451so7674387b3.0 for ; Wed, 17 Jul 2024 18:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721264485; x=1721869285; 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=86P6lehyXq0UCz+szOa7LpHKfu0TP8+WJUv3yJsN71E=; b=vNdRK9gA5Sq8caXjiNoZKDhHVPE+zeSd73zPslaClRnnoCzwAzJd45tWtJ8P3K/la7 LLGYJ0qCGrXPmaS50S/toiLjrTdQ+LCQ3bGSXKrAqeQoQwjyha33EQqVP1fi2bXKLzoQ MhDN4JBbJWm7jm0N8JR+rffQaSnNBYD7XvsAhbWPr7WqFAuV1FXbWP3MP2QXojppo0e4 5BddMk6Lk7X7NwIj/nyhO1/alk9BIxvzG5HOxx9RpO3Sr9/dh0Wlgk7kjFsQderUHqt1 SgHyiU10v1I56BGjP++imo+rXP/6VQ8J5v1hjhGIFJJ6obnaiJNyhM4mWTbWxXAhWLmI tAnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721264485; x=1721869285; 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=86P6lehyXq0UCz+szOa7LpHKfu0TP8+WJUv3yJsN71E=; b=o7BFoGM0Y12SIZ2JSFTWgzG0k7zj6hcm6GfKrgJh5RZb3tglx0D3xTZ3Gl61xcIz9F 5QgEwpit8FPVAT91igL/1PHQTMLiN8ZmX9D7bp9cbII+0RtjOTIihtOb+0cYCXVGtR5b LwmdNuxOhvzxBNvKLS7mw6fkNcW6f4+BTexju31E3Lidq7mz0mOZk1N2trCK91ZH6iCR pY6uB3VoYUuk+p4rVQxhfh7+orLpYlnuAp8w3dwdlPwT80tVpqRyHUUvgBt6LTdqUnwR qJn/mpUN37ZGl45THj+47hct1NCZCzMtMCXIx5unNOIBrEknoArBPG+2LcP+fVwBHMYJ emMw== X-Forwarded-Encrypted: i=1; AJvYcCXq/+Y92SAN9VvjplAN2FiU8mO1Pl8Kb+yQdYOw8RtoiAeeWNWUlPATgQ/rZIXF2zHS4HnAMQ0oVHDhqn9NwrGUEgxGY5peDmjJtjd6pkxJ7tQ28Mg= X-Gm-Message-State: AOJu0YyblXOT8frgohikd2ThNAk8xdsaVrCqvObubACkeDT0D0fa5jGz BgIxjmyx0cIIRKSWtm7JMCZGbITpIFZgkhCkUr9SZ/97YkWYmudMOGlekaQ/pcsYrB4filesrVL PGg+bBg== X-Google-Smtp-Source: AGHT+IGW5p0HgLAn8l5aYZBJ4Boo4bm6ly1P78GV/4bDdqw7hMUFDKApK0Y7U+/yyqc8Q3iikYnotrKwO6YX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:940b:9044:fa83:4060]) (user=irogers job=sendgmr) by 2002:a05:690c:10d:b0:631:259b:fce6 with SMTP id 00721157ae682-66603ed354fmr233327b3.9.1721264485416; Wed, 17 Jul 2024 18:01:25 -0700 (PDT) Date: Wed, 17 Jul 2024 18:00:17 -0700 In-Reply-To: <20240718010023.1495687-1-irogers@google.com> Message-Id: <20240718010023.1495687-22-irogers@google.com> Mime-Version: 1.0 References: <20240718010023.1495687-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog Subject: [PATCH v6 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 , 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-20240717_180126_764082_42692F3C X-CRM114-Status: GOOD ( 12.29 ) 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 Reviewed-by: Adrian Hunter --- 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.1089.g2a221341d9-goog