perf sched: Make struct perf_sched sched a local variable

Change "struct perf_sched sched" from being global to being local.

The build slowdown cured by f36f83f947ed is dealt with in the following
patch, by programatically setting perf_sched.curr_pid.

Signed-off-by: Adrian Hunter <[email protected]>
Acked-by: David Ahern <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 5a46b102eb081416d8c9af35f855a7b1b09e2e5a..5a338566195e335145a8bec29ddf95e1cad8d23e 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1655,29 +1655,28 @@ static int __cmd_record(int argc, const char **argv)
        return cmd_record(i, rec_argv, NULL);
 }
 
-static const char default_sort_order[] = "avg, max, switch, runtime";
-static struct perf_sched sched = {
-       .tool = {
-               .sample          = perf_sched__process_tracepoint_sample,
-               .comm            = perf_event__process_comm,
-               .lost            = perf_event__process_lost,
-               .fork            = perf_sched__process_fork_event,
-               .ordered_samples = true,
-       },
-       .cmp_pid              = LIST_HEAD_INIT(sched.cmp_pid),
-       .sort_list            = LIST_HEAD_INIT(sched.sort_list),
-       .start_work_mutex     = PTHREAD_MUTEX_INITIALIZER,
-       .work_done_wait_mutex = PTHREAD_MUTEX_INITIALIZER,
-       .curr_pid             = { [0 ... MAX_CPUS - 1] = -1 },
-       .sort_order           = default_sort_order,
-       .replay_repeat        = 10,
-       .profile_cpu          = -1,
-       .next_shortname1      = 'A',
-       .next_shortname2      = '0',
-};
-
 int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused)
 {
+       const char default_sort_order[] = "avg, max, switch, runtime";
+       struct perf_sched sched = {
+               .tool = {
+                       .sample          = perf_sched__process_tracepoint_sample,
+                       .comm            = perf_event__process_comm,
+                       .lost            = perf_event__process_lost,
+                       .fork            = perf_sched__process_fork_event,
+                       .ordered_samples = true,
+               },
+               .cmp_pid              = LIST_HEAD_INIT(sched.cmp_pid),
+               .sort_list            = LIST_HEAD_INIT(sched.sort_list),
+               .start_work_mutex     = PTHREAD_MUTEX_INITIALIZER,
+               .work_done_wait_mutex = PTHREAD_MUTEX_INITIALIZER,
+               .curr_pid             = { [0 ... MAX_CPUS - 1] = -1 },
+               .sort_order           = default_sort_order,
+               .replay_repeat        = 10,
+               .profile_cpu          = -1,
+               .next_shortname1      = 'A',
+               .next_shortname2      = '0',
+       };
        const struct option latency_options[] = {
        OPT_STRING('s', "sort", &sched.sort_order, "key[,key2...]",
                   "sort by key(s): runtime, switch, avg, max"),