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

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

perf session: Split out user event processing 



Simplify further.

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.110956235@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3dfc2c0a

tools/perf/util/session.c

+24 −18
Original line number Diff line number Diff line
@@ -748,23 +748,9 @@ static int perf_session__preprocess_sample(struct perf_session *session, 
	return 0;

}



static int perf_session__process_event(struct perf_session *session,

				       event_t *event,

				       struct perf_event_ops *ops,

				       u64 file_offset)

static int perf_session__process_user_event(struct perf_session *session, event_t *event,

					    struct perf_event_ops *ops, u64 file_offset)

{

	struct sample_data sample;

	int ret;



	if (session->header.needs_swap && event__swap_ops[event->header.type])

		event__swap_ops[event->header.type](event);



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

		return -EINVAL;



	hists__inc_nr_events(&session->hists, event->header.type);



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

	dump_event(session, event, file_offset, NULL);



	/* These events are processed right away */
@@ -782,9 +768,29 @@ static int perf_session__process_event(struct perf_session *session, 
	case PERF_RECORD_FINISHED_ROUND:

		return ops->finished_round(event, session, ops);

	default:

		break;

		return -EINVAL;

	}

}



static int perf_session__process_event(struct perf_session *session,

				       event_t *event,

				       struct perf_event_ops *ops,

				       u64 file_offset)

{

	struct sample_data sample;

	int ret;



	if (session->header.needs_swap && event__swap_ops[event->header.type])

		event__swap_ops[event->header.type](event);



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

		return -EINVAL;



	hists__inc_nr_events(&session->hists, event->header.type);



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

		return perf_session__process_user_event(session, event, ops, file_offset);



	/*

	 * For all kernel events we get the sample data

	 */