perf session: Use perf_evlist__sample_id_all more extensively

Removing perf_session->sample_id_all, as it can be obtained from the
evsel/evlist.

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-ok58u1mlc5ci9b6p36r52uh1@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7f3be652
...@@ -25,7 +25,7 @@ int perf_session__parse_sample(struct perf_session *session, ...@@ -25,7 +25,7 @@ int perf_session__parse_sample(struct perf_session *session,
return perf_event__parse_sample(event, first->attr.sample_type, return perf_event__parse_sample(event, first->attr.sample_type,
first->sample_size, first->sample_size,
session->sample_id_all, sample, first->attr.sample_id_all, sample,
session->header.needs_swap); session->header.needs_swap);
} }
...@@ -103,7 +103,6 @@ static int perf_session__open(struct perf_session *self, bool force) ...@@ -103,7 +103,6 @@ static int perf_session__open(struct perf_session *self, bool force)
void perf_session__update_sample_type(struct perf_session *self) void perf_session__update_sample_type(struct perf_session *self)
{ {
self->sample_id_all = perf_evlist__sample_id_all(self->evlist);
self->id_hdr_size = perf_evlist__id_hdr_size(self->evlist); self->id_hdr_size = perf_evlist__id_hdr_size(self->evlist);
self->host_machine.id_hdr_size = self->id_hdr_size; self->host_machine.id_hdr_size = self->id_hdr_size;
machines__set_id_hdr_size(&self->machines, self->id_hdr_size); machines__set_id_hdr_size(&self->machines, self->id_hdr_size);
...@@ -177,7 +176,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, ...@@ -177,7 +176,7 @@ struct perf_session *perf_session__new(const char *filename, int mode,
} }
if (tool && tool->ordering_requires_timestamps && if (tool && tool->ordering_requires_timestamps &&
tool->ordered_samples && !self->sample_id_all) { tool->ordered_samples && !perf_evlist__sample_id_all(self->evlist)) {
dump_printf("WARNING: No sample_id_all support, falling back to unordered processing\n"); dump_printf("WARNING: No sample_id_all support, falling back to unordered processing\n");
tool->ordered_samples = false; tool->ordered_samples = false;
} }
...@@ -887,7 +886,7 @@ static void perf_session__print_tstamp(struct perf_session *session, ...@@ -887,7 +886,7 @@ static void perf_session__print_tstamp(struct perf_session *session,
u64 sample_type = perf_evlist__sample_type(session->evlist); u64 sample_type = perf_evlist__sample_type(session->evlist);
if (event->header.type != PERF_RECORD_SAMPLE && if (event->header.type != PERF_RECORD_SAMPLE &&
!session->sample_id_all) { !perf_evlist__sample_id_all(session->evlist)) {
fputs("-1 -1 ", stdout); fputs("-1 -1 ", stdout);
return; return;
} }
...@@ -1090,7 +1089,7 @@ static int perf_session__process_event(struct perf_session *session, ...@@ -1090,7 +1089,7 @@ static int perf_session__process_event(struct perf_session *session,
int ret; int ret;
if (session->header.needs_swap) if (session->header.needs_swap)
event_swap(event, session->sample_id_all); event_swap(event, perf_evlist__sample_id_all(session->evlist));
if (event->header.type >= PERF_RECORD_HEADER_MAX) if (event->header.type >= PERF_RECORD_HEADER_MAX)
return -EINVAL; return -EINVAL;
......
...@@ -44,7 +44,6 @@ struct perf_session { ...@@ -44,7 +44,6 @@ struct perf_session {
int fd; int fd;
bool fd_pipe; bool fd_pipe;
bool repipe; bool repipe;
bool sample_id_all;
u16 id_hdr_size; u16 id_hdr_size;
int cwdlen; int cwdlen;
char *cwd; char *cwd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment