From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753817AbbJTHtP (ORCPT ); Tue, 20 Oct 2015 03:49:15 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48348 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753312AbbJTHtL (ORCPT ); Tue, 20 Oct 2015 03:49:11 -0400 Date: Tue, 20 Oct 2015 00:48:56 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: tglx@linutronix.de, kan.liang@intel.com, jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, hpa@zytor.com, a.p.zijlstra@chello.nl Reply-To: mingo@kernel.org, jolsa@kernel.org, kan.liang@intel.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, acme@redhat.com, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, namhyung@kernel.org In-Reply-To: <1444992092-17897-30-git-send-email-jolsa@kernel.org> References: <1444992092-17897-30-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Add AGGR_UNSET mode Git-Commit-ID: 208df99ed07ca5e86ee41617e0384930fc9ca819 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: 208df99ed07ca5e86ee41617e0384930fc9ca819 Gitweb: http://git.kernel.org/tip/208df99ed07ca5e86ee41617e0384930fc9ca819 Author: Jiri Olsa AuthorDate: Fri, 16 Oct 2015 12:41:04 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 19 Oct 2015 18:02:07 -0300 perf stat: Add AGGR_UNSET mode Adding AGGR_UNSET mode, so we could distinguish unset aggr_mode in following patches. Signed-off-by: Jiri Olsa Tested-by: Kan Liang Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1444992092-17897-30-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 5 +++++ tools/perf/util/stat.c | 1 + tools/perf/util/stat.h | 1 + 3 files changed, 7 insertions(+) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 1840572..abeb15a 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -479,6 +479,7 @@ static void aggr_printout(struct perf_evsel *evsel, int id, int nr) csv_sep); break; case AGGR_GLOBAL: + case AGGR_UNSET: default: break; } @@ -799,6 +800,8 @@ static void print_interval(char *prefix, struct timespec *ts) case AGGR_GLOBAL: default: fprintf(output, "# time counts %*s events\n", unit_width, "unit"); + case AGGR_UNSET: + break; } } @@ -880,6 +883,7 @@ static void print_counters(struct timespec *ts, int argc, const char **argv) evlist__for_each(evsel_list, counter) print_counter(counter, prefix); break; + case AGGR_UNSET: default: break; } @@ -960,6 +964,7 @@ static int perf_stat_init_aggr_mode(void) case AGGR_NONE: case AGGR_GLOBAL: case AGGR_THREAD: + case AGGR_UNSET: default: break; } diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 93e6d69..8373741 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -272,6 +272,7 @@ process_counter_values(struct perf_stat_config *config, struct perf_evsel *evsel aggr->ena += count->ena; aggr->run += count->run; } + case AGGR_UNSET: default: break; } diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index f8d9d5c..da1d11c 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -31,6 +31,7 @@ enum aggr_mode { AGGR_SOCKET, AGGR_CORE, AGGR_THREAD, + AGGR_UNSET, }; struct perf_stat_config {