mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
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: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
9bf1a52914
commit
1971f59f1a
1 changed files with 16 additions and 2 deletions
|
@ -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,
|
static int read_cb(struct perf_evsel *evsel, int cpu, int thread __maybe_unused,
|
||||||
struct perf_counts_values *count)
|
struct perf_counts_values *count)
|
||||||
{
|
{
|
||||||
|
struct perf_counts_values *aggr = &evsel->counts->aggr;
|
||||||
|
|
||||||
switch (aggr_mode) {
|
switch (aggr_mode) {
|
||||||
case AGGR_CORE:
|
case AGGR_CORE:
|
||||||
case AGGR_SOCKET:
|
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);
|
update_shadow_stats(evsel, count->values);
|
||||||
break;
|
break;
|
||||||
case AGGR_GLOBAL:
|
case AGGR_GLOBAL:
|
||||||
|
aggr->val += count->val;
|
||||||
|
if (scale) {
|
||||||
|
aggr->ena += count->ena;
|
||||||
|
aggr->run += count->run;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -408,20 +415,27 @@ static int read_cb(struct perf_evsel *evsel, int cpu, int thread __maybe_unused,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int read_counter(struct perf_evsel *counter);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Read out the results of a single counter:
|
* Read out the results of a single counter:
|
||||||
* aggregate counts across CPUs in system-wide mode
|
* aggregate counts across CPUs in system-wide mode
|
||||||
*/
|
*/
|
||||||
static int read_counter_aggr(struct perf_evsel *counter)
|
static int read_counter_aggr(struct perf_evsel *counter)
|
||||||
{
|
{
|
||||||
|
struct perf_counts_values *aggr = &counter->counts->aggr;
|
||||||
struct perf_stat *ps = counter->priv;
|
struct perf_stat *ps = counter->priv;
|
||||||
u64 *count = counter->counts->aggr.values;
|
u64 *count = counter->counts->aggr.values;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (__perf_evsel__read(counter, perf_evsel__nr_cpus(counter),
|
aggr->val = aggr->ena = aggr->run = 0;
|
||||||
thread_map__nr(evsel_list->threads), scale) < 0)
|
|
||||||
|
if (read_counter(counter))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
perf_evsel__compute_deltas(counter, -1, aggr);
|
||||||
|
perf_counts_values__scale(aggr, scale, &counter->counts->scaled);
|
||||||
|
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 3; i++)
|
||||||
update_stats(&ps->res_stats[i], count[i]);
|
update_stats(&ps->res_stats[i], count[i]);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue