renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
Code

perf stat: Hide internal duration_time counter

Browse Source 
Some perf stat metrics use an internal "duration_time" metric. It is not
correctly printed however. So hide it during output to avoid confusing
users with 0 counts.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20170831194036.30146-11-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Andi Kleen 2017-08-31 12:40:35 -07:00 committed by Arnaldo Carvalho de Melo
parent fd48aad9b0
commit e864c5ca14
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/perf/builtin-stat.c
View File

@ -195,6 +195,11 @@ static struct perf_stat_config stat_config = {
.scale = true, .scale = true,
}; };
static bool is_duration_time(struct perf_evsel *evsel)
{
return !strcmp(evsel->name, "duration_time");
}
static inline void diff_timespec(struct timespec *r, struct timespec *a, static inline void diff_timespec(struct timespec *r, struct timespec *a,
struct timespec *b) struct timespec *b)
{ {
@ -1363,6 +1368,9 @@ static void print_aggr(char *prefix)
ad.id = id = aggr_map->map[s]; ad.id = id = aggr_map->map[s];
first = true; first = true;
evlist__for_each_entry(evsel_list, counter) { evlist__for_each_entry(evsel_list, counter) {
if (is_duration_time(counter))
continue;
ad.val = ad.ena = ad.run = 0; ad.val = ad.ena = ad.run = 0;
ad.nr = 0; ad.nr = 0;
if (!collect_data(counter, aggr_cb, &ad)) if (!collect_data(counter, aggr_cb, &ad))
@ -1506,6 +1514,8 @@ static void print_no_aggr_metric(char *prefix)
if (prefix) if (prefix)
fputs(prefix, stat_config.output); fputs(prefix, stat_config.output);
evlist__for_each_entry(evsel_list, counter) { evlist__for_each_entry(evsel_list, counter) {
if (is_duration_time(counter))
continue;
if (first) { if (first) {
aggr_printout(counter, cpu, 0); aggr_printout(counter, cpu, 0);
first = false; first = false;
@ -1560,6 +1570,8 @@ static void print_metric_headers(const char *prefix, bool no_indent)
/* Print metrics headers only */ /* Print metrics headers only */
evlist__for_each_entry(evsel_list, counter) { evlist__for_each_entry(evsel_list, counter) {
if (is_duration_time(counter))
continue;
os.evsel = counter; os.evsel = counter;
out.ctx = &os; out.ctx = &os;
out.print_metric = print_metric_header; out.print_metric = print_metric_header;
@ -1707,12 +1719,18 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
print_aggr(prefix); print_aggr(prefix);
break; break;
case AGGR_THREAD: case AGGR_THREAD:
evlist__for_each_entry(evsel_list, counter) evlist__for_each_entry(evsel_list, counter) {
if (is_duration_time(counter))
continue;
print_aggr_thread(counter, prefix); print_aggr_thread(counter, prefix);
}
break; break;
case AGGR_GLOBAL: case AGGR_GLOBAL:
evlist__for_each_entry(evsel_list, counter) evlist__for_each_entry(evsel_list, counter) {
if (is_duration_time(counter))
continue;
print_counter_aggr(counter, prefix); print_counter_aggr(counter, prefix);
}
if (metric_only) if (metric_only)
fputc('\n', stat_config.output); fputc('\n', stat_config.output);
break; break;
@ -1720,8 +1738,11 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
if (metric_only) if (metric_only)
print_no_aggr_metric(prefix); print_no_aggr_metric(prefix);
else { else {
evlist__for_each_entry(evsel_list, counter) evlist__for_each_entry(evsel_list, counter) {
if (is_duration_time(counter))
continue;
print_counter(counter, prefix); print_counter(counter, prefix);
}
} }
break; break;
case AGGR_UNSET: case AGGR_UNSET: