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

diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
index 9e2170604b66612e1ef564e18bf633370ed489f5..021e9b1d5cc520b6c217906930b0d262ccd9d19c 100644 (file)
--- a/tools/perf/util/data-convert-bt.c
+++ b/tools/perf/util/data-convert-bt.c
@@ -1607,25 +1607,23 @@ int bt_convert__perf2ctf(const char *input, const char *path,
                .mode      = PERF_DATA_MODE_READ,
                .force     = opts->force,
        };
-       struct convert c = {
-               .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,
-                       .tracing_data    = perf_event__process_tracing_data,
-                       .build_id        = perf_event__process_build_id,
-                       .namespaces      = perf_event__process_namespaces,
-                       .ordered_events  = true,
-                       .ordering_requires_timestamps = true,
-               },
-       };
+       struct convert c = {};
        struct ctf_writer *cw = &c.writer;
        int err;
 
+       perf_tool__init(&c.tool, /*ordered_events=*/true);
+       c.tool.sample          = process_sample_event;
+       c.tool.mmap            = perf_event__process_mmap;
+       c.tool.mmap2           = perf_event__process_mmap2;
+       c.tool.comm            = perf_event__process_comm;
+       c.tool.exit            = perf_event__process_exit;
+       c.tool.fork            = perf_event__process_fork;
+       c.tool.lost            = perf_event__process_lost;
+       c.tool.tracing_data    = perf_event__process_tracing_data;
+       c.tool.build_id        = perf_event__process_build_id;
+       c.tool.namespaces      = perf_event__process_namespaces;
+       c.tool.ordering_requires_timestamps = true;
+
        if (opts->all) {
                c.tool.comm = process_comm_event;
                c.tool.exit = process_exit_event;