Skip to content

Commit c2b3c17

Browse files
Andi Kleenacmel
Andi Kleen
authored andcommitted
perf stat: Revert checks for duration_time
This reverts e864c5c ("perf stat: Hide internal duration_time counter") but doing it manually since the code has now moved to a different file. The next patch will properly implement duration_time as a full event, so no need to hide it anymore. Signed-off-by: Andi Kleen <[email protected]> Acked-by: Jiri Olsa <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 7fcfa9a commit c2b3c17

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

tools/perf/util/stat-display.c

-18
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
#define CNTR_NOT_SUPPORTED "<not supported>"
1919
#define CNTR_NOT_COUNTED "<not counted>"
2020

21-
static bool is_duration_time(struct perf_evsel *evsel)
22-
{
23-
return !strcmp(evsel->name, "duration_time");
24-
}
25-
2621
static void print_running(struct perf_stat_config *config,
2722
u64 run, u64 ena)
2823
{
@@ -628,9 +623,6 @@ static void print_aggr(struct perf_stat_config *config,
628623
ad.id = id = config->aggr_map->map[s];
629624
first = true;
630625
evlist__for_each_entry(evlist, counter) {
631-
if (is_duration_time(counter))
632-
continue;
633-
634626
ad.val = ad.ena = ad.run = 0;
635627
ad.nr = 0;
636628
if (!collect_data(config, counter, aggr_cb, &ad))
@@ -848,8 +840,6 @@ static void print_no_aggr_metric(struct perf_stat_config *config,
848840
if (prefix)
849841
fputs(prefix, config->output);
850842
evlist__for_each_entry(evlist, counter) {
851-
if (is_duration_time(counter))
852-
continue;
853843
if (first) {
854844
aggr_printout(config, counter, cpu, 0);
855845
first = false;
@@ -906,8 +896,6 @@ static void print_metric_headers(struct perf_stat_config *config,
906896

907897
/* Print metrics headers only */
908898
evlist__for_each_entry(evlist, counter) {
909-
if (is_duration_time(counter))
910-
continue;
911899
os.evsel = counter;
912900
out.ctx = &os;
913901
out.print_metric = print_metric_header;
@@ -1136,15 +1124,11 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
11361124
break;
11371125
case AGGR_THREAD:
11381126
evlist__for_each_entry(evlist, counter) {
1139-
if (is_duration_time(counter))
1140-
continue;
11411127
print_aggr_thread(config, _target, counter, prefix);
11421128
}
11431129
break;
11441130
case AGGR_GLOBAL:
11451131
evlist__for_each_entry(evlist, counter) {
1146-
if (is_duration_time(counter))
1147-
continue;
11481132
print_counter_aggr(config, counter, prefix);
11491133
}
11501134
if (metric_only)
@@ -1155,8 +1139,6 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
11551139
print_no_aggr_metric(config, evlist, prefix);
11561140
else {
11571141
evlist__for_each_entry(evlist, counter) {
1158-
if (is_duration_time(counter))
1159-
continue;
11601142
print_counter(config, counter, prefix);
11611143
}
11621144
}

0 commit comments

Comments
 (0)