Skip to content

Commit

Permalink
perf stat: Do not use the global 'evsel_list' in print functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Aug 30, 2018
1 parent 6f6b659 commit a138af6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tools/perf/builtin-stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ static void print_metric_header(struct perf_stat_config *config,
static int first_shadow_cpu(struct perf_stat_config *config,
struct perf_evsel *evsel, int id)
{
struct perf_evlist *evlist = evsel->evlist;
int i;

if (!config->aggr_get_id)
Expand All @@ -928,7 +929,7 @@ static int first_shadow_cpu(struct perf_stat_config *config,
for (i = 0; i < perf_evsel__nr_cpus(evsel); 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 0;
Expand Down Expand Up @@ -1103,7 +1104,7 @@ static void aggr_update_shadow(struct perf_stat_config *config,
evlist__for_each_entry(evlist, counter) {
val = 0;
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)
continue;
val += perf_counts(counter->counts, cpu, 0)->val;
Expand Down

0 comments on commit a138af6

Please sign in to comment.