lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf evsel: Adopt parse_sample method from perf_event

Browse Source 
Since we need evsel->{attr.{sample_{id_all,type}},sample_size},
reducing the number of parameters tools have to pass.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-wdtmgak0ihgsmw1brb54a8h4@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2012-08-02 12:23:46 -03:00
parent cb0b29e086
commit a3f698fe30
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/util/event.h
View File

@@ -197,9 +197,6 @@ int perf_event__preprocess_sample(const union perf_event *self,
const char *perf_event__name(unsigned int id); 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, int perf_event__synthesize_sample(union perf_event *event, u64 type,
const struct perf_sample *sample, const struct perf_sample *sample,
bool swapped); bool swapped);

6
tools/perf/util/evlist.c
View File

@@ -882,11 +882,9 @@ int perf_evlist__start_workload(struct perf_evlist *evlist)
return 0; return 0;
} }
int perf_evlist__parse_sample(struct perf_evlist *evlist, int perf_evlist__parse_sample(struct perf_evlist *evlist, union perf_event *event,
const union perf_event *event,
struct perf_sample *sample, bool swapped) struct perf_sample *sample, bool swapped)
{ {
struct perf_evsel *e = list_entry(evlist->entries.next, struct perf_evsel, node); 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, return perf_evsel__parse_sample(e, event, sample, swapped);
e->attr.sample_id_all, sample, swapped);
} }

3
tools/perf/util/evlist.h
View File

@@ -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); bool perf_evlist__sample_id_all(const const struct perf_evlist *evlist);
u16 perf_evlist__id_hdr_size(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, int perf_evlist__parse_sample(struct perf_evlist *evlist, union perf_event *event,
const union perf_event *event,
struct perf_sample *sample, bool swapped); struct perf_sample *sample, bool swapped);
bool perf_evlist__valid_sample_type(const struct perf_evlist *evlist); bool perf_evlist__valid_sample_type(const struct perf_evlist *evlist);

12
tools/perf/util/evsel.c
View File

@@ -729,10 +729,10 @@ static bool sample_overlap(const union perf_event *event,
return false; return false;
} }
int perf_event__parse_sample(const union perf_event *event, u64 type, int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,
int sample_size, bool sample_id_all,
struct perf_sample *data, bool swapped) struct perf_sample *data, bool swapped)
{ {
u64 type = evsel->attr.sample_type;
const u64 *array; const u64 *array;
/* /*
@@ -747,14 +747,14 @@ int perf_event__parse_sample(const union perf_event *event, u64 type,
data->period = 1; data->period = 1;
if (event->header.type != PERF_RECORD_SAMPLE) { if (event->header.type != PERF_RECORD_SAMPLE) {
if (!sample_id_all) if (!evsel->attr.sample_id_all)
return 0; return 0;
return perf_event__parse_id_sample(event, type, data, swapped); return perf_event__parse_id_sample(event, type, data, swapped);
} }
array = event->sample.array; 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; return -EFAULT;
if (type & PERF_SAMPLE_IP) { 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; u.val32[1] = sample->tid;
if (swapped) { 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[0] = bswap_32(u.val32[0]);
u.val32[1] = bswap_32(u.val32[1]); 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; u.val32[0] = sample->cpu;
if (swapped) { 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[0] = bswap_32(u.val32[0]);
u.val64 = bswap_64(u.val64); u.val64 = bswap_64(u.val64);

2
tools/perf/util/evsel.h
View File

@@ -180,4 +180,6 @@ static inline int perf_evsel__read_scaled(struct perf_evsel *evsel,
void hists__init(struct hists *hists); 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 */ #endif /* __PERF_EVSEL_H */