perf evsel: Update sample_size when setting sample_type bits
Commit-ID: 7be5ebe8767eaa482e18f566de5f56c1519abf59 Gitweb: http://git.kernel.org/tip/7be5ebe8767eaa482e18f566de5f56c1519abf59 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 10 Dec 2012 14:53:43 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Dec 2012 14:53:43 -0300
perf evsel: Update sample_size when setting sample_type bits
We use evsel->sample_size to detect underflows in perf_evsel__parse_sample, but we were failing to update it after perf_evsel__init(), i.e. when we decide, after creating an evsel, that we want some extra field bit set.
Fix it by introducing methods to set a bit that will take care of correctly adjusting evsel->sample_size.
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]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-top.c | 11 ++++++----- tools/perf/tests/perf-record.c | 6 +++--- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 45 ++++++++++++++++++++++++++++++------------ tools/perf/util/evsel.h | 11 +++++++++++ 6 files changed, 54 insertions(+), 23 deletions(-)
tools/perf/builtin-record.c +1 -1
@@ -286,7 +286,7 @@ try_again:*/ opts->sample_id_all_missing = true;if (!opts->sample_time && !opts->raw_samples && !time_needed) - attr->sample_type &= ~PERF_SAMPLE_TIME ; +perf_evsel__reset_sample_bit (pos,TIME ); goto retry_sample_id; }
tools/perf/builtin-top.c +6 -5
@@ -901,24 +901,25 @@ static void perf_top__start_counters(struct perf_top *top)list_for_each_entry (counter, &evlist->entries, node) {struct perf_event_attr *attr = &counter->attr; - attr->sample_type =PERF_SAMPLE_IP |PERF_SAMPLE_TID ; +perf_evsel__set_sample_bit (counter,IP ); +perf_evsel__set_sample_bit (counter,TID );if (top->freq) { - attr->sample_type |=PERF_SAMPLE_PERIOD ; +perf_evsel__set_sample_bit (counter,PERIOD ); attr->freq =1 ; attr->sample_freq = top->freq; }if (evlist->nr_entries >1 ) { - attr->sample_type |=PERF_SAMPLE_ID ; +perf_evsel__set_sample_bit (counter,ID ); attr->read_format |=PERF_FORMAT_ID ; }if (perf_target__has_cpu (&top->target)) - attr->sample_type |=PERF_SAMPLE_CPU ; +perf_evsel__set_sample_bit (counter,CPU );if (symbol_conf.use_callchain) - attr->sample_type |=PERF_SAMPLE_CALLCHAIN ; +perf_evsel__set_sample_bit (counter,CALLCHAIN ); attr->mmap =1 ; attr->comm =1 ;
tools/perf/tests/perf-record.c +3 -3
@@ -103,9 +103,9 @@ int test__PERF_RECORD(void)* Config the evsels, setting attr->comm on the first one, etc. */ evsel =perf_evlist__first (evlist); - evsel->attr.sample_type |=PERF_SAMPLE_CPU ; - evsel->attr.sample_type |=PERF_SAMPLE_TID ; - evsel->attr.sample_type |=PERF_SAMPLE_TIME ; +perf_evsel__set_sample_bit (evsel,CPU ); +perf_evsel__set_sample_bit (evsel,TID ); +perf_evsel__set_sample_bit (evsel,TIME );perf_evlist__config_attrs (evlist, &opts); err =sched__get_first_possible_cpu (evlist->workload.pid, &cpu_mask);
tools/perf/util/evlist.c +1 -1
@@ -61,7 +61,7 @@ void perf_evlist__config_attrs(struct perf_evlist *evlist,perf_evsel__config (evsel, opts);if (evlist->nr_entries >1 ) - evsel->attr.sample_type |=PERF_SAMPLE_ID ; +perf_evsel__set_sample_bit (evsel,ID ); } }
tools/perf/util/evsel.c +32 -13
95 lines not on this page · raw message
tools/perf/util/evsel.h +11 -0
@@ -118,6 +118,17 @@ void perf_evsel__free_fd(struct perf_evsel *evsel);void perf_evsel__free_id (struct perf_evsel *evsel);void perf_evsel__close_fd (struct perf_evsel *evsel,int ncpus,int nthreads); +void __perf_evsel__set_sample_bit (struct perf_evsel *evsel, +enum perf_event_sample_format bit); +void __perf_evsel__reset_sample_bit (struct perf_evsel *evsel, +enum perf_event_sample_format bit); + +#define perf_evsel__set_sample_bit (evsel, bit) \ + __perf_evsel__set_sample_bit(evsel, PERF_SAMPLE_##bit) + +#define perf_evsel__reset_sample_bit (evsel, bit) \ + __perf_evsel__reset_sample_bit(evsel, PERF_SAMPLE_##bit) +int perf_evsel__set_filter (struct perf_evsel *evsel,int ncpus,int nthreads,const char *filter);