summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-12-07 12:48:58 +0000
committerArnaldo Carvalho de Melo <acme@redhat.com>2010-12-09 12:13:13 -0200
commit3dfc2c0aee789843d18f6e4675658e6879465a56 (patch)
tree8b08c442b32b3dd4df6c206fca4d2439c80db1a9 /tools
parent532e7269c01098f0be6e08113c6947ec6ed11bfa (diff)
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: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/session.c40
1 files changed, 25 insertions, 15 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 7c5cc129207a..a765b274390e 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -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);