iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf stat: Pass 'evlist' to aggr_update_shadow()

Browse Source 
Pass a 'evlist' argument to aggr_update_shadow(), to get rid of the
global 'evsel_list' variable dependency.

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-31-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:39 +02:00 committed by Arnaldo Carvalho de Melo
parent ae2d7da554
commit 77e0faf855
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1099,7 +1099,8 @@ static void printout(struct perf_stat_config *config, int id, int nr,
} }
} }
static void aggr_update_shadow(struct perf_stat_config *config) static void aggr_update_shadow(struct perf_stat_config *config,
struct perf_evlist *evlist)
{ {
int cpu, s2, id, s; int cpu, s2, id, s;
u64 val; u64 val;
@ -1107,7 +1108,7 @@ static void aggr_update_shadow(struct perf_stat_config *config)
for (s = 0; s < aggr_map->nr; s++) { for (s = 0; s < aggr_map->nr; s++) {
id = aggr_map->map[s]; id = aggr_map->map[s];
evlist__for_each_entry(evsel_list, counter) { evlist__for_each_entry(evlist, counter) {
val = 0; val = 0;
for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
s2 = aggr_get_id(evsel_list->cpus, cpu); s2 = aggr_get_id(evsel_list->cpus, cpu);
@ -1238,7 +1239,7 @@ static void print_aggr(struct perf_stat_config *config,
if (!(aggr_map || aggr_get_id)) if (!(aggr_map || aggr_get_id))
return; return;
aggr_update_shadow(config); aggr_update_shadow(config, evlist);
/* /*
* With metric_only everything is on a single line. * With metric_only everything is on a single line.