[tip:perf/core] perf stat: Handled scaled == -1 case for counters

From: tip-bot for Andi Kleen
Date: Sat Feb 20 2016 - 06:36:01 EST


Commit-ID: b002f3bbd321993c1a6d56b86544065420156ab9
Gitweb: http://git.kernel.org/tip/b002f3bbd321993c1a6d56b86544065420156ab9
Author: Andi Kleen <ak@xxxxxxxxxxxxxxx>
AuthorDate: Wed, 17 Feb 2016 14:44:00 -0800
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Fri, 19 Feb 2016 19:12:45 -0300

perf stat: Handled scaled == -1 case for counters

Arnaldo pointed out that the earlier cb110f471025 ("perf stat: Move
noise/running printing into printout") change changed behavior for not
counted counters. This patch fixes it again.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Fixes: cb110f471025 ("perf stat: Move noise/running printing into printout")
Link: http://lkml.kernel.org/r/1455749045-18098-2-git-send-email-andi@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-stat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 15e4fcf..86289df 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -860,7 +860,7 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,

nl = new_line_std;

- if (run == 0 || ena == 0) {
+ if (run == 0 || ena == 0 || counter->counts->scaled == -1) {
aggr_printout(counter, id, nr);

fprintf(stat_config.output, "%*s%s",