perf diff: Use perf_tool__init()

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 <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20240812204720.631678-22-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 4c0567882a7a596220bb8026b2cc7699ba66667a..28c5208fcdc9b8caebbc73db3e86cced76d81316 100644 (file)
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -467,21 +467,7 @@ out:
        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);