From: Andi Kleen <[email protected]>
When --metric-only is enabled there were no headers for the topology
in interval mode. Fix this here.
Before
$ perf stat --metric-only -e cycles,instructions -a -I 1000
1.000554967 insn per cycle stalled cycles per insn
1.000554967 0.27
2.000862000 0.24
3.001354948 0.25
After
$ perf stat --metric-only -e cycles,instructions -a -I 1000
1.000554967 insn per cycle stalled cycles per insn
1.000554967 0.27
2.000862000 0.24
3.001354948 0.25
Reported-by: Jiri Olsa <[email protected]>
Signed-off-by: Andi Kleen <[email protected]>
---
tools/perf/builtin-stat.c | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 7c5c50b61b28..74d0849d728e 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1347,23 +1347,38 @@ static void print_interval(char *prefix, struct
timespec *ts)
sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, csv_sep);
- if (num_print_interval == 0 && !csv_output && !metric_only) {
+ if (num_print_interval == 0 && !csv_output) {
switch (stat_config.aggr_mode) {
case AGGR_SOCKET:
- fprintf(output, "# time socket cpus
counts %*s events\n", unit_width, "unit");
+ fprintf(output, "# time socket cpus");
+ if (!metric_only)
+ fprintf(output, " counts %*s
events", unit_width, "unit");
+ fputc('\n', output);
break;
case AGGR_CORE:
- fprintf(output, "# time core cpus
counts %*s events\n", unit_width, "unit");
+ fprintf(output, "# time core cpus");
+ if (!metric_only)
+ fprintf(output, " counts %*s
events", unit_width, "unit");
+ fputc('\n', output);
break;
case AGGR_NONE:
- fprintf(output, "# time CPU
counts %*s events\n", unit_width, "unit");
+ fprintf(output, "# time CPU");
+ if (!metric_only)
+ fprintf(output, " counts %*s
events", unit_width, "unit");
+ fputc('\n', output);
break;
case AGGR_THREAD:
- fprintf(output, "# time comm-pid
counts %*s events\n", unit_width, "unit");
+ fprintf(output, "# time
comm-pid");
+ if (!metric_only)
+ fprintf(output, " counts %*s
events\n", unit_width, "unit");
+ fputc('\n', output);
break;
case AGGR_GLOBAL:
default:
- fprintf(output, "# time counts
%*s events\n", unit_width, "unit");
+ fprintf(output, "# time");
+ if (!metric_only)
+ fprintf(output, " counts %*s
events\n", unit_width, "unit");
+ fputc('\n', output);
case AGGR_UNSET:
break;
}
--
2.5.5
