perf evsel: Adopt parse_sample method from perf_event
Commit-ID: a3f698fe3082ff80a7f3b27c9b64b4b748c81f9d Gitweb: http://git.kernel.org/tip/a3f698fe3082ff80a7f3b27c9b64b4b748c81f9d Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 2 Aug 2012 12:23:46 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 2 Aug 2012 12:23:46 -0300
perf evsel: Adopt parse_sample method from perf_event
Since we need evsel->{attr.{sample_{id_all,type}},sample_size}, reducing the number of parameters tools have to pass.
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/util/event.h | 3 --- tools/perf/util/evlist.c | 6 ++---- tools/perf/util/evlist.h | 3 +-- tools/perf/util/evsel.c | 12 ++++++------ tools/perf/util/evsel.h | 2 ++ 5 files changed, 11 insertions(+), 15 deletions(-)
tools/perf/util/event.h +0 -3
@@ -197,9 +197,6 @@ int perf_event__preprocess_sample(const union perf_event *self,const char *perf_event__name (unsigned int id); -int perf_event__parse_sample (const union perf_event *event,u64 type, -int sample_size,bool sample_id_all, -struct perf_sample *sample,bool swapped);int perf_event__synthesize_sample (union perf_event *event,u64 type,const struct perf_sample *sample,bool swapped);
tools/perf/util/evlist.c +2 -4
@@ -882,11 +882,9 @@ int perf_evlist__start_workload(struct perf_evlist *evlist)return 0 ; } -int perf_evlist__parse_sample (struct perf_evlist *evlist, -const union perf_event *event, +int perf_evlist__parse_sample (struct perf_evlist *evlist,union perf_event *event,struct perf_sample *sample,bool swapped) { struct perf_evsel *e = list_entry(evlist->entries.next, struct perf_evsel, node); -return perf_event__parse_sample (event, e->attr.sample_type, e->sample_size, - e->attr.sample_id_all, sample, swapped); +return perf_evsel__parse_sample (e, event, sample, swapped); }
tools/perf/util/evlist.h +1 -2
@@ -122,8 +122,7 @@ u64 perf_evlist__sample_type(const struct perf_evlist *evlist);bool perf_evlist__sample_id_all (const const struct perf_evlist *evlist);u16 perf_evlist__id_hdr_size (const struct perf_evlist *evlist); -int perf_evlist__parse_sample (struct perf_evlist *evlist, -const union perf_event *event, +int perf_evlist__parse_sample (struct perf_evlist *evlist,union perf_event *event,struct perf_sample *sample,bool swapped);bool perf_evlist__valid_sample_type (const struct perf_evlist *evlist);
tools/perf/util/evsel.c +6 -6
@@ -729,10 +729,10 @@ static bool sample_overlap(const union perf_event *event,return false; } -int perf_event__parse_sample (const union perf_event *event,u64 type, -int sample_size,bool sample_id_all, +int perf_evsel__parse_sample (struct perf_evsel *evsel,union perf_event *event,struct perf_sample *data,bool swapped) { +u64 type = evsel->attr.sample_type;const u64 *array;/*
@@ -747,14 +747,14 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, data->period =1 ;if (event->header.type !=PERF_RECORD_SAMPLE ) { -if (!sample_id_all) +if (!evsel->attr.sample_id_all)return 0 ;return perf_event__parse_id_sample (event, type, data, swapped); } array = event->sample.array; -if (sample_size +sizeof (event->header) > event->header.size) +if (evsel->sample_size +sizeof (event->header) > event->header.size)return -EFAULT ;if (type &PERF_SAMPLE_IP ) {
@@ -896,7 +896,7 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, u.val32[1 ] = sample->tid;if (swapped) {/* -* Inverse of what is done in perf_event__parse_sample +* Inverse of what is done in perf_evsel__parse_sample */ u.val32[0 ] =bswap_32 (u.val32[0 ]); u.val32[1 ] =bswap_32 (u.val32[1 ]);
@@ -931,7 +931,7 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, u.val32[0 ] = sample->cpu;if (swapped) {/* -* Inverse of what is done in perf_event__parse_sample +* Inverse of what is done in perf_evsel__parse_sample */ u.val32[0 ] =bswap_32 (u.val32[0 ]); u.val64 =bswap_64 (u.val64);
tools/perf/util/evsel.h +2 -0
@@ -180,4 +180,6 @@ static inline int perf_evsel__read_scaled(struct perf_evsel *evsel,void hists__init (struct hists *hists); +int perf_evsel__parse_sample (struct perf_evsel *evsel,union perf_event *event, +struct perf_sample *sample,bool swapped);#endif /* __PERF_EVSEL_H */