Commit ab90caa7 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Rename aggr_data cpu to imply it's an index 



Trying to make cpu maps less error prone.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Vineet Singh <vineet.singh@intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: zhengjun.xing@intel.com
Link: https://lore.kernel.org/r/20220105061351.120843-31-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7316268f

tools/perf/util/stat-display.c

+5 −5
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ struct aggr_data { 
	u64 ena, run, val;

	struct aggr_cpu_id id;

	int nr;

	int cpu;

	int cpu_map_idx;

};



static void aggr_cb(struct perf_stat_config *config,
@@ -878,9 +878,9 @@ static void counter_cb(struct perf_stat_config *config __maybe_unused, 
{

	struct aggr_data *ad = data;



	ad->val += perf_counts(counter->counts, ad->cpu, 0)->val;

	ad->ena += perf_counts(counter->counts, ad->cpu, 0)->ena;

	ad->run += perf_counts(counter->counts, ad->cpu, 0)->run;

	ad->val += perf_counts(counter->counts, ad->cpu_map_idx, 0)->val;

	ad->ena += perf_counts(counter->counts, ad->cpu_map_idx, 0)->ena;

	ad->run += perf_counts(counter->counts, ad->cpu_map_idx, 0)->run;

}



/*
@@ -897,7 +897,7 @@ static void print_counter(struct perf_stat_config *config, 
	struct aggr_cpu_id id;



	for (cpu = 0; cpu < evsel__nr_cpus(counter); cpu++) {

		struct aggr_data ad = { .cpu = cpu };

		struct aggr_data ad = { .cpu_map_idx = cpu };



		if (!collect_data(config, counter, counter_cb, &ad))

			return;