summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa2015-04-07 23:25:16 +0200
committerArnaldo Carvalho de Melo2015-04-29 15:38:05 +0200
commit9f71b4f39d7c01cae9d80e938774ff6b0a9bfd80 (patch)
treea147cdef5c3aa13d307a25259781a7d87e9ee443 /tools
parentperf stat: Fix metrics calculation with event qualifiers (diff)
downloadkernel-qcow2-linux-9f71b4f39d7c01cae9d80e938774ff6b0a9bfd80.tar.gz
kernel-qcow2-linux-9f71b4f39d7c01cae9d80e938774ff6b0a9bfd80.tar.xz
kernel-qcow2-linux-9f71b4f39d7c01cae9d80e938774ff6b0a9bfd80.zip
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 <jolsa@kernel.org> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: William Cohen <wcohen@redhat.com> Link: http://lkml.kernel.org/r/1428441919-23099-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/builtin-stat.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 52f433084779..cca100dc5fd0 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)