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

Commit 3dfc2c0a authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Arnaldo Carvalho de Melo
Browse files

perf session: Split out sample preprocessing 



Simplify the code a bit.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ian Munsie <imunsie@au1.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20101207124551.014649793@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 532e7269

tools/perf/util/session.c

+25 −15
Original line number Diff line number Diff line
@@ -732,6 +732,22 @@ static int perf_session_deliver_event(struct perf_session *session, 
	}

}



static int perf_session__preprocess_sample(struct perf_session *session,

					   event_t *event, struct sample_data *sample)

{

	if (event->header.type != PERF_RECORD_SAMPLE ||

	    !(session->sample_type & PERF_SAMPLE_CALLCHAIN))

		return 0;



	if (!ip_callchain__valid(sample->callchain, event)) {

		pr_debug("call-chain problem with event, skipping it.\n");

		++session->hists.stats.nr_invalid_chains;

		session->hists.stats.total_invalid_chains += sample->period;

		return -EINVAL;

	}

	return 0;

}



static int perf_session__process_event(struct perf_session *session,

				       event_t *event,

				       struct perf_event_ops *ops,
@@ -750,24 +766,9 @@ static int perf_session__process_event(struct perf_session *session, 


	if (event->header.type >= PERF_RECORD_USER_TYPE_START)

		dump_event(session, event, file_offset, NULL);

	else

		event__parse_sample(event, session, &sample);



	/* These events are processed right away */

	switch (event->header.type) {

	case PERF_RECORD_SAMPLE:

		if (session->sample_type & PERF_SAMPLE_CALLCHAIN) {

			if (!ip_callchain__valid(sample.callchain, event)) {

				pr_debug("call-chain problem with event, "

					 "skipping it.\n");

				++session->hists.stats.nr_invalid_chains;

				session->hists.stats.total_invalid_chains +=

					sample.period;

				return 0;

			}

		}

		break;



	case PERF_RECORD_HEADER_ATTR:

		return ops->attr(event, session);

	case PERF_RECORD_HEADER_EVENT_TYPE:
@@ -784,6 +785,15 @@ static int perf_session__process_event(struct perf_session *session, 
		break;

	}



	/*

	 * For all kernel events we get the sample data

	 */

	event__parse_sample(event, session, &sample);



	/* Preprocess sample records - precheck callchains */

	if (perf_session__preprocess_sample(session, event, &sample))

		return 0;



	if (ops->ordered_samples) {

		ret = perf_session_queue_event(session, event, &sample,

					       file_offset);