perf c2c: 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-13-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 88c131d05186e2c82456ca7f56b2da9a10dd42ee..cd2bd573bfc38e293d65778a805ad7dd79d19432 100644 (file)
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -385,24 +385,6 @@ free_mi:
        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);