perf session: Pass evsel in event_ops->sample()

Resolving the sample->id to an evsel since the most advanced tools,
report and annotate, and the others will too when they evolve to
properly support multi-event perf.data files.

Good also because it does an extra validation, checking that the ID is
valid when present. When that is not the case, the overhead is just a
branch + function call (perf_evlist__id2evsel).

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 880f5731
...@@ -42,9 +42,9 @@ static const char *sym_hist_filter; ...@@ -42,9 +42,9 @@ static const char *sym_hist_filter;
static int perf_evlist__add_sample(struct perf_evlist *evlist, static int perf_evlist__add_sample(struct perf_evlist *evlist,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel,
struct addr_location *al) struct addr_location *al)
{ {
struct perf_evsel *evsel;
struct hist_entry *he; struct hist_entry *he;
int ret; int ret;
...@@ -59,18 +59,6 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist, ...@@ -59,18 +59,6 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist,
return 0; return 0;
} }
evsel = perf_evlist__id2evsel(evlist, sample->id);
if (evsel == NULL) {
/*
* FIXME: Propagate this back, but at least we're in a builtin,
* where exit() is allowed. ;-)
*/
ui__warning("Invalid %s file, contains samples with id not in "
"its header!\n", input_name);
exit_browser(0);
exit(1);
}
he = __hists__add_entry(&evsel->hists, al, NULL, 1); he = __hists__add_entry(&evsel->hists, al, NULL, 1);
if (he == NULL) if (he == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -92,6 +80,7 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist, ...@@ -92,6 +80,7 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist,
static int process_sample_event(union perf_event *event, static int process_sample_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel,
struct perf_session *session) struct perf_session *session)
{ {
struct addr_location al; struct addr_location al;
...@@ -103,7 +92,8 @@ static int process_sample_event(union perf_event *event, ...@@ -103,7 +92,8 @@ static int process_sample_event(union perf_event *event,
return -1; return -1;
} }
if (!al.filtered && perf_evlist__add_sample(session->evlist, sample, &al)) { if (!al.filtered &&
perf_evlist__add_sample(session->evlist, sample, evsel, &al)) {
pr_warning("problem incrementing symbol count, " pr_warning("problem incrementing symbol count, "
"skipping event\n"); "skipping event\n");
return -1; return -1;
......
...@@ -32,6 +32,7 @@ static int hists__add_entry(struct hists *self, ...@@ -32,6 +32,7 @@ static int hists__add_entry(struct hists *self,
static int diff__process_sample_event(union perf_event *event, static int diff__process_sample_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel __used,
struct perf_session *session) struct perf_session *session)
{ {
struct addr_location al; struct addr_location al;
......
...@@ -43,6 +43,14 @@ static int perf_event__repipe(union perf_event *event, ...@@ -43,6 +43,14 @@ static int perf_event__repipe(union perf_event *event,
return perf_event__repipe_synth(event, session); return perf_event__repipe_synth(event, session);
} }
static int perf_event__repipe_sample(union perf_event *event,
struct perf_sample *sample __used,
struct perf_evsel *evsel __used,
struct perf_session *session)
{
return perf_event__repipe_synth(event, session);
}
static int perf_event__repipe_mmap(union perf_event *event, static int perf_event__repipe_mmap(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_session *session) struct perf_session *session)
...@@ -124,6 +132,7 @@ static int dso__inject_build_id(struct dso *self, struct perf_session *session) ...@@ -124,6 +132,7 @@ static int dso__inject_build_id(struct dso *self, struct perf_session *session)
static int perf_event__inject_buildid(union perf_event *event, static int perf_event__inject_buildid(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel __used,
struct perf_session *session) struct perf_session *session)
{ {
struct addr_location al; struct addr_location al;
...@@ -164,7 +173,7 @@ static int perf_event__inject_buildid(union perf_event *event, ...@@ -164,7 +173,7 @@ static int perf_event__inject_buildid(union perf_event *event,
} }
struct perf_event_ops inject_ops = { struct perf_event_ops inject_ops = {
.sample = perf_event__repipe, .sample = perf_event__repipe_sample,
.mmap = perf_event__repipe, .mmap = perf_event__repipe,
.comm = perf_event__repipe, .comm = perf_event__repipe,
.fork = perf_event__repipe, .fork = perf_event__repipe,
......
...@@ -305,6 +305,7 @@ static void process_raw_event(union perf_event *raw_event __used, void *data, ...@@ -305,6 +305,7 @@ static void process_raw_event(union perf_event *raw_event __used, void *data,
static int process_sample_event(union perf_event *event, static int process_sample_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel __used,
struct perf_session *session) struct perf_session *session)
{ {
struct thread *thread = perf_session__findnew(session, event->ip.pid); struct thread *thread = perf_session__findnew(session, event->ip.pid);
......
...@@ -845,7 +845,9 @@ static void dump_info(void) ...@@ -845,7 +845,9 @@ static void dump_info(void)
die("Unknown type of information\n"); die("Unknown type of information\n");
} }
static int process_sample_event(union perf_event *event, struct perf_sample *sample, static int process_sample_event(union perf_event *event,
struct perf_sample *sample,
struct perf_evsel *evsel __used,
struct perf_session *s) struct perf_session *s)
{ {
struct thread *thread = perf_session__findnew(s, sample->tid); struct thread *thread = perf_session__findnew(s, sample->tid);
......
...@@ -50,12 +50,12 @@ static symbol_filter_t annotate_init; ...@@ -50,12 +50,12 @@ static symbol_filter_t annotate_init;
static int perf_session__add_hist_entry(struct perf_session *session, static int perf_session__add_hist_entry(struct perf_session *session,
struct addr_location *al, struct addr_location *al,
struct perf_sample *sample) struct perf_sample *sample,
struct perf_evsel *evsel)
{ {
struct symbol *parent = NULL; struct symbol *parent = NULL;
int err = 0; int err = 0;
struct hist_entry *he; struct hist_entry *he;
struct perf_evsel *evsel;
if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) { if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {
err = perf_session__resolve_callchain(session, al->thread, err = perf_session__resolve_callchain(session, al->thread,
...@@ -64,18 +64,6 @@ static int perf_session__add_hist_entry(struct perf_session *session, ...@@ -64,18 +64,6 @@ static int perf_session__add_hist_entry(struct perf_session *session,
return err; return err;
} }
evsel = perf_evlist__id2evsel(session->evlist, sample->id);
if (evsel == NULL) {
/*
* FIXME: Propagate this back, but at least we're in a builtin,
* where exit() is allowed. ;-)
*/
ui__warning("Invalid %s file, contains samples with id %" PRIu64 " not in "
"its header!\n", input_name, sample->id);
exit_browser(0);
exit(1);
}
he = __hists__add_entry(&evsel->hists, al, parent, sample->period); he = __hists__add_entry(&evsel->hists, al, parent, sample->period);
if (he == NULL) if (he == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -113,6 +101,7 @@ static int perf_session__add_hist_entry(struct perf_session *session, ...@@ -113,6 +101,7 @@ static int perf_session__add_hist_entry(struct perf_session *session,
static int process_sample_event(union perf_event *event, static int process_sample_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel,
struct perf_session *session) struct perf_session *session)
{ {
struct addr_location al; struct addr_location al;
...@@ -127,7 +116,7 @@ static int process_sample_event(union perf_event *event, ...@@ -127,7 +116,7 @@ static int process_sample_event(union perf_event *event,
if (al.filtered || (hide_unresolved && al.sym == NULL)) if (al.filtered || (hide_unresolved && al.sym == NULL))
return 0; return 0;
if (perf_session__add_hist_entry(session, &al, sample)) { if (perf_session__add_hist_entry(session, &al, sample, evsel)) {
pr_debug("problem incrementing symbol period, skipping event\n"); pr_debug("problem incrementing symbol period, skipping event\n");
return -1; return -1;
} }
......
...@@ -1603,6 +1603,7 @@ static void process_raw_event(union perf_event *raw_event __used, ...@@ -1603,6 +1603,7 @@ static void process_raw_event(union perf_event *raw_event __used,
static int process_sample_event(union perf_event *event, static int process_sample_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel __used,
struct perf_session *session) struct perf_session *session)
{ {
struct thread *thread; struct thread *thread;
......
...@@ -162,19 +162,11 @@ static void print_sample_start(struct perf_sample *sample, ...@@ -162,19 +162,11 @@ static void print_sample_start(struct perf_sample *sample,
static void process_event(union perf_event *event __unused, static void process_event(union perf_event *event __unused,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel,
struct perf_session *session, struct perf_session *session,
struct thread *thread) struct thread *thread)
{ {
struct perf_event_attr *attr; struct perf_event_attr *attr = &evsel->attr;
struct perf_evsel *evsel;
evsel = perf_evlist__id2evsel(session->evlist, sample->id);
if (evsel == NULL) {
pr_err("Invalid data. Contains samples with id not in "
"its header!\n");
return;
}
attr = &evsel->attr;
if (output_fields[attr->type] == 0) if (output_fields[attr->type] == 0)
return; return;
...@@ -244,6 +236,7 @@ static char const *input_name = "perf.data"; ...@@ -244,6 +236,7 @@ static char const *input_name = "perf.data";
static int process_sample_event(union perf_event *event, static int process_sample_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel,
struct perf_session *session) struct perf_session *session)
{ {
struct thread *thread = perf_session__findnew(session, event->ip.pid); struct thread *thread = perf_session__findnew(session, event->ip.pid);
...@@ -264,7 +257,7 @@ static int process_sample_event(union perf_event *event, ...@@ -264,7 +257,7 @@ static int process_sample_event(union perf_event *event,
last_timestamp = sample->time; last_timestamp = sample->time;
return 0; return 0;
} }
scripting_ops->process_event(event, sample, session, thread); scripting_ops->process_event(event, sample, evsel, session, thread);
session->hists.stats.total_period += sample->period; session->hists.stats.total_period += sample->period;
return 0; return 0;
......
...@@ -488,6 +488,7 @@ static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te) ...@@ -488,6 +488,7 @@ static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te)
static int process_sample_event(union perf_event *event __used, static int process_sample_event(union perf_event *event __used,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel __used,
struct perf_session *session) struct perf_session *session)
{ {
struct trace_entry *te; struct trace_entry *te;
...@@ -506,6 +507,16 @@ static int process_sample_event(union perf_event *event __used, ...@@ -506,6 +507,16 @@ static int process_sample_event(union perf_event *event __used,
struct power_entry_old *peo; struct power_entry_old *peo;
peo = (void *)te; peo = (void *)te;
#endif #endif
/*
* FIXME: use evsel, its already mapped from id to perf_evsel,
* remove perf_header__find_event infrastructure bits.
* Mapping all these "power:cpu_idle" strings to the tracepoint
* ID and then just comparing against evsel->attr.config.
*
* e.g.:
*
* if (evsel->attr.config == power_cpu_idle_id)
*/
event_str = perf_header__find_event(te->type); event_str = perf_header__find_event(te->type);
if (!event_str) if (!event_str)
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
static int build_id__mark_dso_hit(union perf_event *event, static int build_id__mark_dso_hit(union perf_event *event,
struct perf_sample *sample __used, struct perf_sample *sample __used,
struct perf_evsel *evsel __used,
struct perf_session *session) struct perf_session *session)
{ {
struct addr_location al; struct addr_location al;
......
...@@ -29,6 +29,7 @@ struct events_stats { ...@@ -29,6 +29,7 @@ struct events_stats {
u32 nr_events[PERF_RECORD_HEADER_MAX]; u32 nr_events[PERF_RECORD_HEADER_MAX];
u32 nr_unknown_events; u32 nr_unknown_events;
u32 nr_invalid_chains; u32 nr_invalid_chains;
u32 nr_unknown_id;
}; };
enum hist_column { enum hist_column {
......
...@@ -247,6 +247,7 @@ static inline struct event *find_cache_event(int type) ...@@ -247,6 +247,7 @@ static inline struct event *find_cache_event(int type)
static void perl_process_event(union perf_event *pevent __unused, static void perl_process_event(union perf_event *pevent __unused,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel,
struct perf_session *session __unused, struct perf_session *session __unused,
struct thread *thread) struct thread *thread)
{ {
......
...@@ -206,6 +206,7 @@ static inline struct event *find_cache_event(int type) ...@@ -206,6 +206,7 @@ static inline struct event *find_cache_event(int type)
static void python_process_event(union perf_event *pevent __unused, static void python_process_event(union perf_event *pevent __unused,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel __unused,
struct perf_session *session __unused, struct perf_session *session __unused,
struct thread *thread) struct thread *thread)
{ {
......
...@@ -280,6 +280,15 @@ static int process_event_synth_stub(union perf_event *event __used, ...@@ -280,6 +280,15 @@ static int process_event_synth_stub(union perf_event *event __used,
return 0; return 0;
} }
static int process_event_sample_stub(union perf_event *event __used,
struct perf_sample *sample __used,
struct perf_evsel *evsel __used,
struct perf_session *session __used)
{
dump_printf(": unhandled!\n");
return 0;
}
static int process_event_stub(union perf_event *event __used, static int process_event_stub(union perf_event *event __used,
struct perf_sample *sample __used, struct perf_sample *sample __used,
struct perf_session *session __used) struct perf_session *session __used)
...@@ -303,7 +312,7 @@ static int process_finished_round(union perf_event *event, ...@@ -303,7 +312,7 @@ static int process_finished_round(union perf_event *event,
static void perf_event_ops__fill_defaults(struct perf_event_ops *handler) static void perf_event_ops__fill_defaults(struct perf_event_ops *handler)
{ {
if (handler->sample == NULL) if (handler->sample == NULL)
handler->sample = process_event_stub; handler->sample = process_event_sample_stub;
if (handler->mmap == NULL) if (handler->mmap == NULL)
handler->mmap = process_event_stub; handler->mmap = process_event_stub;
if (handler->comm == NULL) if (handler->comm == NULL)
...@@ -698,12 +707,19 @@ static int perf_session_deliver_event(struct perf_session *session, ...@@ -698,12 +707,19 @@ static int perf_session_deliver_event(struct perf_session *session,
struct perf_event_ops *ops, struct perf_event_ops *ops,
u64 file_offset) u64 file_offset)
{ {
struct perf_evsel *evsel;
dump_event(session, event, file_offset, sample); dump_event(session, event, file_offset, sample);
switch (event->header.type) { switch (event->header.type) {
case PERF_RECORD_SAMPLE: case PERF_RECORD_SAMPLE:
dump_sample(session, event, sample); dump_sample(session, event, sample);
return ops->sample(event, sample, session); evsel = perf_evlist__id2evsel(session->evlist, sample->id);
if (evsel == NULL) {
++session->hists.stats.nr_unknown_id;
return -1;
}
return ops->sample(event, sample, evsel, session);
case PERF_RECORD_MMAP: case PERF_RECORD_MMAP:
return ops->mmap(event, sample, session); return ops->mmap(event, sample, session);
case PERF_RECORD_COMM: case PERF_RECORD_COMM:
...@@ -845,6 +861,11 @@ static void perf_session__warn_about_errors(const struct perf_session *session, ...@@ -845,6 +861,11 @@ static void perf_session__warn_about_errors(const struct perf_session *session,
session->hists.stats.nr_unknown_events); session->hists.stats.nr_unknown_events);
} }
if (session->hists.stats.nr_unknown_id != 0) {
ui__warning("%u samples with id not present in the header\n",
session->hists.stats.nr_unknown_id);
}
if (session->hists.stats.nr_invalid_chains != 0) { if (session->hists.stats.nr_invalid_chains != 0) {
ui__warning("Found invalid callchains!\n\n" ui__warning("Found invalid callchains!\n\n"
"%u out of %u events were discarded for this reason.\n\n" "%u out of %u events were discarded for this reason.\n\n"
......
...@@ -55,8 +55,11 @@ struct perf_session { ...@@ -55,8 +55,11 @@ struct perf_session {
char filename[0]; char filename[0];
}; };
struct perf_evsel;
struct perf_event_ops; struct perf_event_ops;
typedef int (*event_sample)(union perf_event *event, struct perf_sample *sample,
struct perf_evsel *evsel, struct perf_session *session);
typedef int (*event_op)(union perf_event *self, struct perf_sample *sample, typedef int (*event_op)(union perf_event *self, struct perf_sample *sample,
struct perf_session *session); struct perf_session *session);
typedef int (*event_synth_op)(union perf_event *self, typedef int (*event_synth_op)(union perf_event *self,
...@@ -65,8 +68,8 @@ typedef int (*event_op2)(union perf_event *self, struct perf_session *session, ...@@ -65,8 +68,8 @@ typedef int (*event_op2)(union perf_event *self, struct perf_session *session,
struct perf_event_ops *ops); struct perf_event_ops *ops);
struct perf_event_ops { struct perf_event_ops {
event_op sample, event_sample sample;
mmap, event_op mmap,
comm, comm,
fork, fork,
exit, exit,
......
...@@ -38,6 +38,7 @@ static int stop_script_unsupported(void) ...@@ -38,6 +38,7 @@ static int stop_script_unsupported(void)
static void process_event_unsupported(union perf_event *event __unused, static void process_event_unsupported(union perf_event *event __unused,
struct perf_sample *sample __unused, struct perf_sample *sample __unused,
struct perf_evsel *evsel __unused,
struct perf_session *session __unused, struct perf_session *session __unused,
struct thread *thread __unused) struct thread *thread __unused)
{ {
......
...@@ -280,6 +280,7 @@ struct scripting_ops { ...@@ -280,6 +280,7 @@ struct scripting_ops {
int (*stop_script) (void); int (*stop_script) (void);
void (*process_event) (union perf_event *event, void (*process_event) (union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel,
struct perf_session *session, struct perf_session *session,
struct thread *thread); struct thread *thread);
int (*generate_script) (const char *outfile); int (*generate_script) (const char *outfile);
......
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