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

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

perf session: Don't count per evsel events 

PERF_RECORD_SAMPLE was not being counted here and is the only per-evsel
thing anyway, the other events were not mapping to a evsel.

With this we don't require that evsels used with a perf_session need to
have space for hists, like the ones in annotate, report, top.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-kzchpz0l1mhrsfpkirz086m2@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4ea062ed

tools/perf/util/session.c

+0 −16
Original line number Diff line number Diff line
@@ -813,22 +813,6 @@ int perf_session__deliver_event(struct perf_session *session, 
	dump_event(session, event, file_offset, sample);



	evsel = perf_evlist__id2evsel(session->evlist, sample->id);

	if (evsel != NULL && event->header.type != PERF_RECORD_SAMPLE) {

		/*

		 * XXX We're leaving PERF_RECORD_SAMPLE unnacounted here

		 * because the tools right now may apply filters, discarding

		 * some of the samples. For consistency, in the future we

		 * should have something like nr_filtered_samples and remove

		 * the sample->period from total_sample_period, etc, KISS for

		 * now tho.

		 *

		 * Also testing against NULL allows us to handle files without

		 * attr.sample_id_all and/or without PERF_SAMPLE_ID. In the

		 * future probably it'll be a good idea to restrict event

		 * processing via perf_session to files with both set.

		 */

		hists__inc_nr_events(evsel__hists(evsel), event->header.type);

	}



	machine = perf_session__find_machine_for_cpumode(session, event,

							 sample);