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 <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:
@@ -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);
|
||||
|
Reference in New Issue
Block a user