niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

perf stat: Separate counters reading and processing

Browse source 
Separating counters reading and processing so we could use the
processing part in following patches.

Using simple reading via perf_evsel__read function to read counters now,
because part of the processing was in the read_cb callback.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1435310967-14570-16-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2015-06-26 11:29:20 +02:00 • committed by Arnaldo Carvalho de Melo
parent 106a94a0f8
commit 3b3eb04451
1 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
tools/perf/builtin-stat.c
View file

@ -217,7 +217,8 @@ static int check_per_pkg(struct perf_evsel *counter, int cpu, bool *skip)
return 0; return 0;
} }
static int read_cb(struct perf_evsel *evsel, int cpu, int thread, static int
process_counter_values(struct perf_evsel *evsel, int cpu, int thread,
struct perf_counts_values *count) struct perf_counts_values *count)
{ {
struct perf_counts_values *aggr = &evsel->counts->aggr; struct perf_counts_values *aggr = &evsel->counts->aggr;
@ -239,7 +240,6 @@ static int read_cb(struct perf_evsel *evsel, int cpu, int thread,
if (!evsel->snapshot) if (!evsel->snapshot)
perf_evsel__compute_deltas(evsel, cpu, thread, count); perf_evsel__compute_deltas(evsel, cpu, thread, count);
perf_counts_values__scale(count, scale, NULL); perf_counts_values__scale(count, scale, NULL);
*perf_counts(evsel->counts, cpu, thread) = *count;
if (aggr_mode == AGGR_NONE) if (aggr_mode == AGGR_NONE)
perf_stat__update_shadow_stats(evsel, count->values, cpu); perf_stat__update_shadow_stats(evsel, count->values, cpu);
break; break;
@ -256,23 +256,41 @@ static int read_cb(struct perf_evsel *evsel, int cpu, int thread,
return 0; return 0;
} }
static int read_counter(struct perf_evsel *counter); static int process_counter_maps(struct perf_evsel *counter)
{
int nthreads = thread_map__nr(counter->threads);
int ncpus = perf_evsel__nr_cpus(counter);
int cpu, thread;
/* if (counter->system_wide)
* Read out the results of a single counter: nthreads = 1;
* aggregate counts across CPUs in system-wide mode
*/ for (thread = 0; thread < nthreads; thread++) {
static int read_counter_aggr(struct perf_evsel *counter) for (cpu = 0; cpu < ncpus; cpu++) {
if (process_counter_values(counter, cpu, thread,
perf_counts(counter->counts, cpu, thread)))
return -1;
}
}
return 0;
}
static int process_counter(struct perf_evsel *counter)
{ {
struct perf_counts_values *aggr = &counter->counts->aggr; 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, ret;
aggr->val = aggr->ena = aggr->run = 0; aggr->val = aggr->ena = aggr->run = 0;
if (read_counter(counter)) ret = process_counter_maps(counter);
return -1; if (ret)
return ret;
if (aggr_mode != AGGR_GLOBAL)
return 0;
if (!counter->snapshot) if (!counter->snapshot)
perf_evsel__compute_deltas(counter, -1, -1, aggr); perf_evsel__compute_deltas(counter, -1, -1, aggr);
@ -315,7 +333,10 @@ static int read_counter(struct perf_evsel *counter)
for (thread = 0; thread < nthreads; thread++) { for (thread = 0; thread < nthreads; thread++) {
for (cpu = 0; cpu < ncpus; cpu++) { for (cpu = 0; cpu < ncpus; cpu++) {
if (perf_evsel__read_cb(counter, cpu, thread, read_cb)) struct perf_counts_values *count;
count = perf_counts(counter->counts, cpu, thread);
if (perf_evsel__read(counter, cpu, thread, count))
return -1; return -1;
} }
} }
@ -332,10 +353,11 @@ static void read_counters(bool close)
ps = counter->priv; ps = counter->priv;
memset(ps->res_stats, 0, sizeof(ps->res_stats)); memset(ps->res_stats, 0, sizeof(ps->res_stats));
if (aggr_mode == AGGR_GLOBAL) if (read_counter(counter))
read_counter_aggr(counter); pr_warning("failed to read counter %s\n", counter->name);
else
read_counter(counter); if (process_counter(counter))
pr_warning("failed to process counter %s\n", counter->name);
if (close) { if (close) {
perf_evsel__close_fd(counter, perf_evsel__nr_cpus(counter), perf_evsel__close_fd(counter, perf_evsel__nr_cpus(counter),