]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf sched: Use perf_tool__init()
authorIan Rogers <irogers@google.com>
Mon, 12 Aug 2024 20:47:10 +0000 (13:47 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 12 Aug 2024 21:11:27 +0000 (18:11 -0300)
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-19-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-sched.c

index 2c60bd3a8149b7e13e8ade171727eb35697fccfd..34fe8e540c43da708ca43cddee3a5b3e1fd63dce 100644 (file)
@@ -3100,7 +3100,6 @@ static int perf_sched__timehist(struct perf_sched *sched)
        sched->tool.tracing_data = perf_event__process_tracing_data;
        sched->tool.build_id     = perf_event__process_build_id;
 
-       sched->tool.ordered_events = true;
        sched->tool.ordering_requires_timestamps = true;
 
        symbol_conf.use_callchain = sched->show_callchain;
@@ -3605,14 +3604,6 @@ int cmd_sched(int argc, const char **argv)
 {
        static const char default_sort_order[] = "avg, max, switch, runtime";
        struct perf_sched sched = {
-               .tool = {
-                       .sample          = perf_sched__process_tracepoint_sample,
-                       .comm            = perf_sched__process_comm,
-                       .namespaces      = perf_event__process_namespaces,
-                       .lost            = perf_event__process_lost,
-                       .fork            = perf_sched__process_fork_event,
-                       .ordered_events = true,
-               },
                .cmp_pid              = LIST_HEAD_INIT(sched.cmp_pid),
                .sort_list            = LIST_HEAD_INIT(sched.sort_list),
                .sort_order           = default_sort_order,
@@ -3733,6 +3724,13 @@ int cmd_sched(int argc, const char **argv)
        };
        int ret;
 
+       perf_tool__init(&sched.tool, /*ordered_events=*/true);
+       sched.tool.sample        = perf_sched__process_tracepoint_sample;
+       sched.tool.comm          = perf_sched__process_comm;
+       sched.tool.namespaces    = perf_event__process_namespaces;
+       sched.tool.lost          = perf_event__process_lost;
+       sched.tool.fork          = perf_sched__process_fork_event;
+
        argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands,
                                        sched_usage, PARSE_OPT_STOP_AT_NON_OPTION);
        if (!argc)