korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 17:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jiri Olsa 2018-08-30 08:32:21 +02:00 committed by Arnaldo Carvalho de Melo
parent 1821f4eb48
commit 1c21e9899d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/perf/builtin-stat.c
View File

@ -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, static int perf_stat_synthesize_config(struct perf_stat_config *config,
struct perf_tool *tool, struct perf_tool *tool,
struct perf_evlist *evlist,
bool attrs) bool attrs)
{ {
int err; int err;
if (attrs) { if (attrs) {
err = perf_event__synthesize_attrs(tool, evsel_list, err = perf_event__synthesize_attrs(tool, evlist,
process_synthesized_event); process_synthesized_event);
if (err < 0) { if (err < 0) {
pr_err("Couldn't synthesize attrs.\n"); 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, err = perf_event__synthesize_extra_attr(tool, evlist,
evsel_list,
process_synthesized_event, process_synthesized_event,
attrs); attrs);
err = perf_event__synthesize_thread_map2(tool, evsel_list->threads, err = perf_event__synthesize_thread_map2(tool, evlist->threads,
process_synthesized_event, process_synthesized_event,
NULL); NULL);
if (err < 0) { if (err < 0) {
@ -430,7 +430,7 @@ static int perf_stat_synthesize_config(struct perf_stat_config *config,
return err; 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); process_synthesized_event, NULL);
if (err < 0) { if (err < 0) {
pr_err("Couldn't synthesize thread map.\n"); pr_err("Couldn't synthesize thread map.\n");
@ -608,7 +608,8 @@ try_again:
if (err < 0) if (err < 0)
return err; 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) if (err < 0)
return err; return err;
} }