1 files changed, 31 insertions, 27 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 60ccfd52189d..fbdfb338bc38 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2092,10 +2092,39 @@ static int perf_evlist__add_pgfault(struct perf_evlist *evlist,
         return 0;
 }
 
+static void trace__handle_event(struct trace *trace, union perf_event *event, struct perf_sample *sample)
+{
+        const u32 type = event->header.type;
+        struct perf_evsel *evsel;
+
+        if (!trace->full_time && trace->base_time == 0)
+                trace->base_time = sample->time;
+
+        if (type != PERF_RECORD_SAMPLE) {
+                trace__process_event(trace, trace->host, event, sample);
+                return;
+        }
+
+        evsel = perf_evlist__id2evsel(trace->evlist, sample->id);
+        if (evsel == NULL) {
+                fprintf(trace->output, "Unknown tp ID %" PRIu64 ", skipping...\n", sample->id);
+                return;
+        }
+
+        if (evsel->attr.type == PERF_TYPE_TRACEPOINT &&
+            sample->raw_data == NULL) {
+                fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n",
+                       perf_evsel__name(evsel), sample->tid,
+                       sample->cpu, sample->raw_size);
+        } else {
+                tracepoint_handler handler = evsel->handler;
+                handler(trace, evsel, event, sample);
+        }
+}
+
 static int trace__run(struct trace *trace, int argc, const char **argv)
 {
         struct perf_evlist *evlist = trace->evlist;
-        struct perf_evsel *evsel;
         int err = -1, i;
         unsigned long before;
         const bool forks = argc > 0;
@@ -2190,8 +2219,6 @@ again:
                 union perf_event *event;
 
                 while ((event = perf_evlist__mmap_read(evlist, i)) != NULL) {
-                        const u32 type = event->header.type;
-                        tracepoint_handler handler;
                         struct perf_sample sample;
 
                         ++trace->nr_events;
@@ -2202,30 +2229,7 @@ again:
                                 goto next_event;
                         }
 
-                        if (!trace->full_time && trace->base_time == 0)
-                                trace->base_time = sample.time;
-
-                        if (type != PERF_RECORD_SAMPLE) {
-                                trace__process_event(trace, trace->host, event, &sample);
-                                continue;
-                        }
-
-                        evsel = perf_evlist__id2evsel(evlist, sample.id);
-                        if (evsel == NULL) {
-                                fprintf(trace->output, "Unknown tp ID %" PRIu64 ", skipping...\n", sample.id);
-                                goto next_event;
-                        }
-
-                        if (evsel->attr.type == PERF_TYPE_TRACEPOINT &&
-                            sample.raw_data == NULL) {
-                                fprintf(trace->output, "%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n",
-                                       perf_evsel__name(evsel), sample.tid,
-                                       sample.cpu, sample.raw_size);
-                                goto next_event;
-                        }
-
-                        handler = evsel->handler;
-                        handler(trace, evsel, event, &sample);
+                        trace__handle_event(trace, event, &sample);
 next_event:
                         perf_evlist__mmap_consume(evlist, i);