Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1971f59f authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Use read_counter in read_counter_aggr 



Use the read_counter function as the values retrieval function for aggr
counter values thus eliminating the use of __perf_evsel__read function.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1416562275-12404-7-git-send-email-jolsa@kernel.org


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

tools/perf/builtin-stat.c

+16 −2
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ static void update_shadow_stats(struct perf_evsel *counter, u64 *count) 
static int read_cb(struct perf_evsel *evsel, int cpu, int thread __maybe_unused,

		   struct perf_counts_values *count)

{

	struct perf_counts_values *aggr = &evsel->counts->aggr;



	switch (aggr_mode) {

	case AGGR_CORE:

	case AGGR_SOCKET:
@@ -401,6 +403,11 @@ static int read_cb(struct perf_evsel *evsel, int cpu, int thread __maybe_unused, 
		update_shadow_stats(evsel, count->values);

		break;

	case AGGR_GLOBAL:

		aggr->val += count->val;

		if (scale) {

			aggr->ena += count->ena;

			aggr->run += count->run;

		}

	default:

		break;

	}
@@ -408,20 +415,27 @@ static int read_cb(struct perf_evsel *evsel, int cpu, int thread __maybe_unused, 
	return 0;

}



static int read_counter(struct perf_evsel *counter);



/*

 * Read out the results of a single counter:

 * aggregate counts across CPUs in system-wide mode

 */

static int read_counter_aggr(struct perf_evsel *counter)

{

	struct perf_counts_values *aggr = &counter->counts->aggr;

	struct perf_stat *ps = counter->priv;

	u64 *count = counter->counts->aggr.values;

	int i;



	if (__perf_evsel__read(counter, perf_evsel__nr_cpus(counter),

			       thread_map__nr(evsel_list->threads), scale) < 0)

	aggr->val = aggr->ena = aggr->run = 0;



	if (read_counter(counter))

		return -1;



	perf_evsel__compute_deltas(counter, -1, aggr);

	perf_counts_values__scale(aggr, scale, &counter->counts->scaled);



	for (i = 0; i < 3; i++)

		update_stats(&ps->res_stats[i], count[i]);