perf stat: Add 'struct perf_evlist' argument to perf_stat_synthesize_config()

Get rid of the 'evsel_list' global variable dependency, here in
perf_stat_synthesize_config() we are adding the 'evlist' arg.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180830063252.23729-13-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index ae5029875e87a03713e6505721fb5fa296c5d9a9..cb36344c25b763f2e0445482e741b141e96895a8 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -404,12 +404,13 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf
 
 static int perf_stat_synthesize_config(struct perf_stat_config *config,
                                       struct perf_tool *tool,
+                                      struct perf_evlist *evlist,
                                       bool attrs)
 {
        int err;
 
        if (attrs) {
-               err = perf_event__synthesize_attrs(tool, evsel_list,
+               err = perf_event__synthesize_attrs(tool, evlist,
                                                   process_synthesized_event);
                if (err < 0) {
                        pr_err("Couldn't synthesize attrs.\n");
@@ -417,12 +418,11 @@ static int perf_stat_synthesize_config(struct perf_stat_config *config,
                }
        }
 
-       err = perf_event__synthesize_extra_attr(tool,
-                                               evsel_list,
+       err = perf_event__synthesize_extra_attr(tool, evlist,
                                                process_synthesized_event,
                                                attrs);
 
-       err = perf_event__synthesize_thread_map2(tool, evsel_list->threads,
+       err = perf_event__synthesize_thread_map2(tool, evlist->threads,
                                                process_synthesized_event,
                                                NULL);
        if (err < 0) {
@@ -430,7 +430,7 @@ static int perf_stat_synthesize_config(struct perf_stat_config *config,
                return err;
        }
 
-       err = perf_event__synthesize_cpu_map(tool, evsel_list->cpus,
+       err = perf_event__synthesize_cpu_map(tool, evlist->cpus,
                                             process_synthesized_event, NULL);
        if (err < 0) {
                pr_err("Couldn't synthesize thread map.\n");
@@ -608,7 +608,8 @@ try_again:
                if (err < 0)
                        return err;
 
-               err = perf_stat_synthesize_config(&stat_config, NULL, is_pipe);
+               err = perf_stat_synthesize_config(&stat_config, NULL, evsel_list,
+                                                 is_pipe);
                if (err < 0)
                        return err;
        }