perf evsel: Cache associated event_format

We already lookup the associated event_format when reading the perf.data
header, so that we can cache the tracepoint name in evsel->name, so do
it a little further and save the event_format itself, so that we can
avoid relookups in tools that need to access it.

Change the tools to take the most obvious advantage, when they were
using pevent_find_event directly. More work is needed for further
removing the need of a pointer to pevent, such as when asking for event
field values ("common_pid" and the other common fields and per
event_format fields).

This is something that was planned but only got actually done when
Andrey Wagin needed to do this lookup at perf_tool->sample() time, when
we don't have access to pevent (session->pevent) to use with
pevent_find_event().

Cc: Andrey Wagin <avagin@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: http://lkml.kernel.org/n/tip-txkvew2ckko0b594ae8fbnyk@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 6 insertions, 23 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 1e60ab70b2b1..8dba4707b03f 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -262,14 +262,11 @@ static int perf_session__check_output_opt(struct perf_session *session)
         return 0;
 }
 
-static void print_sample_start(struct pevent *pevent,
-                               struct perf_sample *sample,
+static void print_sample_start(struct perf_sample *sample,
                                struct thread *thread,
                                struct perf_evsel *evsel)
 {
-        int type;
         struct perf_event_attr *attr = &evsel->attr;
-        struct event_format *event;
         const char *evname = NULL;
         unsigned long secs;
         unsigned long usecs;
@@ -307,20 +304,7 @@ static void print_sample_start(struct pevent *pevent,
         }
 
         if (PRINT_FIELD(EVNAME)) {
-                if (attr->type == PERF_TYPE_TRACEPOINT) {
-                        /*
-                         * XXX Do we really need this here?
-                         * perf_evlist__set_tracepoint_names should have done
-                         * this already
-                         */
-                        type = trace_parse_common_type(pevent,
-                                                       sample->raw_data);
-                        event = pevent_find_event(pevent, type);
-                        if (event)
-                                evname = event->name;
-                } else
-                        evname = perf_evsel__name(evsel);
-
+                evname = perf_evsel__name(evsel);
                 printf("%s: ", evname ? evname : "[unknown]");
         }
 }
@@ -416,7 +400,7 @@ static void print_sample_bts(union perf_event *event,
 }
 
 static void process_event(union perf_event *event __unused,
-                          struct pevent *pevent,
+                          struct pevent *pevent __unused,
                           struct perf_sample *sample,
                           struct perf_evsel *evsel,
                           struct machine *machine,
@@ -427,7 +411,7 @@ static void process_event(union perf_event *event __unused,
         if (output[attr->type].fields == 0)
                 return;
 
-        print_sample_start(pevent, sample, thread, evsel);
+        print_sample_start(sample, thread, evsel);
 
         if (is_bts_event(attr)) {
                 print_sample_bts(event, sample, evsel, machine, thread);
@@ -435,9 +419,8 @@ static void process_event(union perf_event *event __unused,
         }
 
         if (PRINT_FIELD(TRACE))
-                print_trace_event(pevent, sample->cpu, sample->raw_data,
-                                  sample->raw_size);
-
+                event_format__print(evsel->tp_format, sample->cpu,
+                                    sample->raw_data, sample->raw_size);
         if (PRINT_FIELD(ADDR))
                 print_sample_addr(event, sample, machine, thread, attr);