From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965139AbbEFDIh (ORCPT ); Tue, 5 May 2015 23:08:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36048 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752825AbbEFDIb (ORCPT ); Tue, 5 May 2015 23:08:31 -0400 Date: Tue, 5 May 2015 20:08:03 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: dsahern@gmail.com, acme@redhat.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com, wcohen@redhat.com, tglx@linutronix.de, paulus@samba.org, jolsa@kernel.org, mingo@kernel.org, andi@firstfloor.org Reply-To: dsahern@gmail.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, mingo@kernel.org, jolsa@kernel.org, paulus@samba.org, andi@firstfloor.org, wcohen@redhat.com, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1428441919-23099-4-git-send-email-jolsa@kernel.org> References: <1428441919-23099-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Change metrics context calculation Git-Commit-ID: 9f71b4f39d7c01cae9d80e938774ff6b0a9bfd80 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: 9f71b4f39d7c01cae9d80e938774ff6b0a9bfd80 Gitweb: http://git.kernel.org/tip/9f71b4f39d7c01cae9d80e938774ff6b0a9bfd80 Author: Jiri Olsa AuthorDate: Tue, 7 Apr 2015 23:25:16 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Apr 2015 10:38:05 -0300 perf stat: Change metrics context calculation Changing metrics context calculation to allow more than 2 types of context. Following patches will add support for the rest of the exclude_* bits so we need separate array element for all context combinations. Signed-off-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Andi Kleen Cc: David Ahern Cc: Paul Mackerras Cc: Peter Zijlstra Cc: William Cohen Link: http://lkml.kernel.org/r/1428441919-23099-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 52f4330..cca100d 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -247,9 +247,13 @@ out_free: return -1; } -#define NUM_CTX 3 +enum { + CTX_BIT_USER = 1 << 0, + CTX_BIT_KERNEL = 1 << 1, + CTX_BIT_MAX = 1 << 2, +}; -enum { CTX_USER, CTX_KERNEL, CTX_ALL }; +#define NUM_CTX CTX_BIT_MAX static struct stats runtime_nsecs_stats[MAX_NR_CPUS]; static struct stats runtime_cycles_stats[NUM_CTX][MAX_NR_CPUS]; @@ -269,12 +273,13 @@ static struct stats runtime_elision_stats[NUM_CTX][MAX_NR_CPUS]; static int evsel_context(struct perf_evsel *evsel) { + int ctx = 0; + if (evsel->attr.exclude_kernel) - return CTX_USER; + ctx |= CTX_BIT_KERNEL; if (evsel->attr.exclude_user) - return CTX_KERNEL; - /* Handle hypervisor too? */ - return CTX_ALL; + ctx |= CTX_BIT_USER; + return ctx; } static void perf_stat__reset_stats(struct perf_evlist *evlist)