Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e69c210 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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

tools/perf/builtin-annotate.c

+4 −14
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ static const char *sym_hist_filter; 


static int perf_evlist__add_sample(struct perf_evlist *evlist,

				   struct perf_sample *sample,

				   struct perf_evsel *evsel,

				   struct addr_location *al)

{

	struct perf_evsel *evsel;

	struct hist_entry *he;

	int ret;
@@ -59,18 +59,6 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist, 
		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);

	if (he == NULL)

		return -ENOMEM;
@@ -92,6 +80,7 @@ static int perf_evlist__add_sample(struct perf_evlist *evlist, 


static int process_sample_event(union perf_event *event,

				struct perf_sample *sample,

				struct perf_evsel *evsel,

				struct perf_session *session)

{

	struct addr_location al;
@@ -103,7 +92,8 @@ static int process_sample_event(union perf_event *event, 
		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, "

			   "skipping event\n");

		return -1;

tools/perf/builtin-diff.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ static int hists__add_entry(struct hists *self, 


static int diff__process_sample_event(union perf_event *event,

				      struct perf_sample *sample,

				      struct perf_evsel *evsel __used,

				      struct perf_session *session)

{

	struct addr_location al;

tools/perf/builtin-inject.c

+10 −1
Original line number Diff line number Diff line
@@ -43,6 +43,14 @@ static int perf_event__repipe(union perf_event *event, 
	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,

				   struct perf_sample *sample,

				   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,

				      struct perf_sample *sample,

				      struct perf_evsel *evsel __used,

				      struct perf_session *session)

{

	struct addr_location al;
@@ -164,7 +173,7 @@ repipe: 
}



struct perf_event_ops inject_ops = {

	.sample		= perf_event__repipe,

	.sample		= perf_event__repipe_sample,

	.mmap		= perf_event__repipe,

	.comm		= perf_event__repipe,

	.fork		= perf_event__repipe,

tools/perf/builtin-kmem.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

				struct perf_sample *sample,

				struct perf_evsel *evsel __used,

				struct perf_session *session)

{

	struct thread *thread = perf_session__findnew(session, event->ip.pid);

tools/perf/builtin-lock.c

+3 −1
Original line number Diff line number Diff line
@@ -845,7 +845,9 @@ static void dump_info(void) 
		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 thread *thread = perf_session__findnew(s, sample->tid);