Skip to content

Commit

Permalink
perf stat: Change metrics context calculation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Apr 29, 2015
1 parent a0aa21e commit 9f71b4f
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions tools/perf/builtin-stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,13 @@ static int perf_evlist__alloc_stats(struct perf_evlist *evlist, bool alloc_raw)
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];
Expand All @@ -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)
Expand Down

0 comments on commit 9f71b4f

Please sign in to comment.