perf evsel: Introduce method to request IDs be used
Commit-ID: 7a5a5ca5fe3df8636c96b49591c23baf7c415dd4 Gitweb: http://git.kernel.org/tip/7a5a5ca5fe3df8636c96b49591c23baf7c415dd4 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 10 Dec 2012 15:21:30 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Dec 2012 15:21:30 -0300
perf evsel: Introduce method to request IDs be used
When mmaping multiple events we need to find the right evsel that matches an event in the ring buffer.
For that we need to set the PERF_FORMAT_ID bit in perf_event_attr.read_format so that when we read the event fds we get that id to then hash it and be able later to use perf_evlist__id2evsel to find the right evsel.
We also need to set the PERF_SAMPLE_ID bit in perf_event_attr.sample_type to ask for that id to be stashed in each sample, so that we can demux it.
So add a perf_evsel__set_sample_id() method to do those two things in one operation.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-top.c | 6 ++---- tools/perf/tests/mmap-basic.c | 3 +-- tools/perf/util/evsel.c | 6 ++++++ tools/perf/util/evsel.h | 2 ++ 4 files changed, 11 insertions(+), 6 deletions(-)
tools/perf/builtin-top.c +2 -4
@@ -910,10 +910,8 @@ static void perf_top__start_counters(struct perf_top *top) attr->sample_freq = top->freq; } -if (evlist->nr_entries >1 ) { -perf_evsel__set_sample_bit (counter,ID ); - attr->read_format |=PERF_FORMAT_ID ; - } +if (evlist->nr_entries >1 ) +perf_evsel__set_sample_id (counter);if (perf_target__has_cpu (&top->target))perf_evsel__set_sample_bit (counter,CPU );
tools/perf/tests/mmap-basic.c +1 -2
@@ -70,8 +70,7 @@ int test__basic_mmap(void) } evsels[i]->attr.wakeup_events =1 ; - evsels[i]->attr.read_format |=PERF_FORMAT_ID ; -perf_evsel__set_sample_bit (evsels[i],ID ); +perf_evsel__set_sample_id (evsels[i]);perf_evlist__add (evlist, evsels[i]);
tools/perf/util/evsel.c +6 -0
@@ -68,6 +68,12 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel, } } +void perf_evsel__set_sample_id (struct perf_evsel *evsel) +{ +perf_evsel__set_sample_bit (evsel,ID ); + evsel->attr.read_format |=PERF_FORMAT_ID ; +} +void perf_evsel__init (struct perf_evsel *evsel,struct perf_event_attr *attr,int idx) {
tools/perf/util/evsel.h +2 -0
@@ -129,6 +129,8 @@ void __perf_evsel__reset_sample_bit(struct perf_evsel *evsel,#define perf_evsel__reset_sample_bit (evsel, bit) \ __perf_evsel__reset_sample_bit(evsel, PERF_SAMPLE_##bit) +void perf_evsel__set_sample_id (struct perf_evsel *evsel); +int perf_evsel__set_filter (struct perf_evsel *evsel,int ncpus,int nthreads,const char *filter);