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

perf stat: Do not use the global 'evsel_list' in print functions

Browse Source 
Get rid of the the 'evsel_list' global variable dependency, here we can
use the 'evlist' pointer from the evsel.

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-38-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:46 +02:00 committed by Arnaldo Carvalho de Melo
parent 6f6b6594b5
commit a138af6635
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -914,6 +914,7 @@ static void print_metric_header(struct perf_stat_config *config,
static int first_shadow_cpu(struct perf_stat_config *config, static int first_shadow_cpu(struct perf_stat_config *config,
struct perf_evsel *evsel, int id) struct perf_evsel *evsel, int id)
{ {
struct perf_evlist *evlist = evsel->evlist;
int i; int i;
if (!config->aggr_get_id) if (!config->aggr_get_id)
@ -928,7 +929,7 @@ static int first_shadow_cpu(struct perf_stat_config *config,
for (i = 0; i < perf_evsel__nr_cpus(evsel); i++) { for (i = 0; i < perf_evsel__nr_cpus(evsel); i++) {
int cpu2 = perf_evsel__cpus(evsel)->map[i]; int cpu2 = perf_evsel__cpus(evsel)->map[i];
if (config->aggr_get_id(config, evsel_list->cpus, cpu2) == id) if (config->aggr_get_id(config, evlist->cpus, cpu2) == id)
return cpu2; return cpu2;
} }
return 0; return 0;
@ -1103,7 +1104,7 @@ static void aggr_update_shadow(struct perf_stat_config *config,
evlist__for_each_entry(evlist, 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 = config->aggr_get_id(config, evsel_list->cpus, cpu); s2 = config->aggr_get_id(config, evlist->cpus, cpu);
if (s2 != id) if (s2 != id)
continue; continue;
val += perf_counts(counter->counts, cpu, 0)->val; val += perf_counts(counter->counts, cpu, 0)->val;