perf trace: Move event delivery to a new deliver_event() function

Mov event delivery code to a new trace__deliver_event() function, so
it's easier to add ordered delivery coming in the following patches.

Signed-off-by: Jiri Olsa <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Dmitry Levin <[email protected]>
Cc: Eugene Syromiatnikov <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Luis Cláudio Gonçalves <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt (VMware) <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
[ Add trace__ prefix to the deliver_event method ]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 98aff12af9e61dfcb851b240d03ea07d30902ac6..3b6b1fecf2bbdbf9130a9daa002d2b95405d6ae9 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2637,6 +2637,21 @@ static int trace__set_filter_pids(struct trace *trace)
        return err;
 }
 
+static int trace__deliver_event(struct trace *trace, union perf_event *event)
+{
+       struct perf_evlist *evlist = trace->evlist;
+       struct perf_sample sample;
+       int err;
+
+       err = perf_evlist__parse_sample(evlist, event, &sample);
+       if (err)
+               fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err);
+       else
+               trace__handle_event(trace, event, &sample);
+
+       return 0;
+}
+
 static int trace__run(struct trace *trace, int argc, const char **argv)
 {
        struct perf_evlist *evlist = trace->evlist;
@@ -2802,18 +2817,10 @@ again:
                        continue;
 
                while ((event = perf_mmap__read_event(md)) != NULL) {
-                       struct perf_sample sample;
-
                        ++trace->nr_events;
 
-                       err = perf_evlist__parse_sample(evlist, event, &sample);
-                       if (err) {
-                               fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err);
-                               goto next_event;
-                       }
+                       trace__deliver_event(trace, event);
 
-                       trace__handle_event(trace, event, &sample);
-next_event:
                        perf_mmap__consume(md);
 
                        if (interrupted)