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

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 31a6f800d55fdf49142b937af58b9ddcfad01e43..54598d1e815a0a06a057d5d5bb5add8281381c09 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -3899,38 +3899,7 @@ int cmd_script(int argc, const char **argv)
        const char *dlfilter_file = NULL;
        const char **__argv;
        int i, j, err = 0;
-       struct perf_script script = {
-               .tool = {
-                       .sample          = process_sample_event,
-                       .mmap            = perf_event__process_mmap,
-                       .mmap2           = perf_event__process_mmap2,
-                       .comm            = perf_event__process_comm,
-                       .namespaces      = perf_event__process_namespaces,
-                       .cgroup          = perf_event__process_cgroup,
-                       .exit            = perf_event__process_exit,
-                       .fork            = perf_event__process_fork,
-                       .attr            = process_attr,
-                       .event_update   = perf_event__process_event_update,
-#ifdef HAVE_LIBTRACEEVENT
-                       .tracing_data    = perf_event__process_tracing_data,
-#endif
-                       .feature         = process_feature_event,
-                       .build_id        = perf_event__process_build_id,
-                       .id_index        = perf_event__process_id_index,
-                       .auxtrace_info   = perf_script__process_auxtrace_info,
-                       .auxtrace        = perf_event__process_auxtrace,
-                       .auxtrace_error  = perf_event__process_auxtrace_error,
-                       .stat            = perf_event__process_stat_event,
-                       .stat_round      = process_stat_round_event,
-                       .stat_config     = process_stat_config_event,
-                       .thread_map      = process_thread_map_event,
-                       .cpu_map         = process_cpu_map_event,
-                       .throttle        = process_throttle_event,
-                       .unthrottle      = process_throttle_event,
-                       .ordered_events  = true,
-                       .ordering_requires_timestamps = true,
-               },
-       };
+       struct perf_script script = {};
        struct perf_data data = {
                .mode = PERF_DATA_MODE_READ,
        };
@@ -4104,10 +4073,8 @@ int cmd_script(int argc, const char **argv)
        data.path  = input_name;
        data.force = symbol_conf.force;
 
-       if (unsorted_dump) {
+       if (unsorted_dump)
                dump_trace = true;
-               script.tool.ordered_events = false;
-       }
 
        if (symbol__validate_sym_arguments())
                return -1;
@@ -4298,6 +4265,34 @@ script_found:
                use_browser = 0;
        }
 
+       perf_tool__init(&script.tool, !unsorted_dump);
+       script.tool.sample               = process_sample_event;
+       script.tool.mmap                 = perf_event__process_mmap;
+       script.tool.mmap2                = perf_event__process_mmap2;
+       script.tool.comm                 = perf_event__process_comm;
+       script.tool.namespaces           = perf_event__process_namespaces;
+       script.tool.cgroup               = perf_event__process_cgroup;
+       script.tool.exit                 = perf_event__process_exit;
+       script.tool.fork                 = perf_event__process_fork;
+       script.tool.attr                 = process_attr;
+       script.tool.event_update         = perf_event__process_event_update;
+#ifdef HAVE_LIBTRACEEVENT
+       script.tool.tracing_data         = perf_event__process_tracing_data;
+#endif
+       script.tool.feature              = process_feature_event;
+       script.tool.build_id             = perf_event__process_build_id;
+       script.tool.id_index             = perf_event__process_id_index;
+       script.tool.auxtrace_info        = perf_script__process_auxtrace_info;
+       script.tool.auxtrace             = perf_event__process_auxtrace;
+       script.tool.auxtrace_error       = perf_event__process_auxtrace_error;
+       script.tool.stat                 = perf_event__process_stat_event;
+       script.tool.stat_round           = process_stat_round_event;
+       script.tool.stat_config          = process_stat_config_event;
+       script.tool.thread_map           = process_thread_map_event;
+       script.tool.cpu_map              = process_cpu_map_event;
+       script.tool.throttle             = process_throttle_event;
+       script.tool.unthrottle           = process_throttle_event;
+       script.tool.ordering_requires_timestamps = true;
        session = perf_session__new(&data, &script.tool);
        if (IS_ERR(session))
                return PTR_ERR(session);