summaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/data_map.c6
-rw-r--r--tools/perf/util/session.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/tools/perf/util/data_map.c b/tools/perf/util/data_map.c
index 08c4cf5e..b557b83 100644
--- a/tools/perf/util/data_map.c
+++ b/tools/perf/util/data_map.c
@@ -144,7 +144,6 @@ int perf_session__process_events(struct perf_session *self,
unsigned long head, shift;
unsigned long offset = 0;
size_t page_size;
- u64 sample_type;
event_t *event;
uint32_t size;
char *buf;
@@ -157,11 +156,10 @@ int perf_session__process_events(struct perf_session *self,
page_size = getpagesize();
head = self->header.data_offset;
- sample_type = perf_header__sample_type(&self->header);
+ self->sample_type = perf_header__sample_type(&self->header);
err = -EINVAL;
- if (ops->sample_type_check &&
- ops->sample_type_check(sample_type, self) < 0)
+ if (ops->sample_type_check && ops->sample_type_check(self) < 0)
goto out_err;
if (!ops->full_paths) {
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index a8f3a49..4e8a21c 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -19,6 +19,7 @@ struct perf_session {
struct rb_root threads;
struct thread *last_match;
struct rb_root hists;
+ u64 sample_type;
int fd;
int cwdlen;
char *cwd;
@@ -39,8 +40,7 @@ struct perf_event_ops {
event_op process_read_event;
event_op process_throttle_event;
event_op process_unthrottle_event;
- int (*sample_type_check)(u64 sample_type,
- struct perf_session *session);
+ int (*sample_type_check)(struct perf_session *session);
unsigned long total_unknown;
bool full_paths;
};
OpenPOWER on IntegriCloud