From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758212AbcBTLf6 (ORCPT ); Sat, 20 Feb 2016 06:35:58 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38073 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758203AbcBTLfy (ORCPT ); Sat, 20 Feb 2016 06:35:54 -0500 Date: Sat, 20 Feb 2016 03:35:43 -0800 From: tip-bot for Andi Kleen Message-ID: Cc: hpa@zytor.com, eranian@google.com, jolsa@kernel.org, ak@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: tglx@linutronix.de, ak@linux.intel.com, jolsa@kernel.org, eranian@google.com, hpa@zytor.com, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1455749045-18098-2-git-send-email-andi@firstfloor.org> References: <1455749045-18098-2-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Handled scaled == -1 case for counters Git-Commit-ID: b002f3bbd321993c1a6d56b86544065420156ab9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b002f3bbd321993c1a6d56b86544065420156ab9 Gitweb: http://git.kernel.org/tip/b002f3bbd321993c1a6d56b86544065420156ab9 Author: Andi Kleen AuthorDate: Wed, 17 Feb 2016 14:44:00 -0800 Committer: Arnaldo Carvalho de Melo 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 Cc: Jiri Olsa Cc: Stephane Eranian Fixes: cb110f471025 ("perf stat: Move noise/running printing into printout") Link: http://lkml.kernel.org/r/1455749045-18098-2-git-send-email-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo --- 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",