summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/evsel.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-03-11 09:28:31 +0100
committerIngo Molnar <mingo@elte.hu>2011-03-11 09:28:31 +0100
commit137ee20ddd10fdc20600c389fe63edab0c39cb1a (patch)
treef2f9db93cbbe1929d2c3380658a546a748181dc9 /tools/perf/util/evsel.h
parent4a0b1665db09cf2da9ad7d0f12da386373c10bfa (diff)
parent1c0b04d10bbe35279c50e3b36cf5b8ec2a0050d8 (diff)
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/util/evsel.h')
-rw-r--r--tools/perf/util/evsel.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 281b60e5fc7..6710ab53834 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -49,12 +49,17 @@ struct perf_evsel {
struct perf_event_attr attr;
char *filter;
struct xyarray *fd;
- struct xyarray *id;
+ struct xyarray *sample_id;
+ u64 *id;
struct perf_counts *counts;
int idx;
+ int ids;
struct hists hists;
char *name;
- void *priv;
+ union {
+ void *priv;
+ off_t id_offset;
+ };
struct cgroup_sel *cgrp;
};