perf: Have perf use the new libtraceevent.a library

The event parsing code in perf was originally copied from trace-cmd
but never was kept up-to-date with the changes that was done there.
The trace-cmd libtraceevent.a code is much more mature than what is
currently in perf.

This updates the code to use wrappers to handle the calls to the
new event parsing code. The new code requires a handle to be pass
around, which removes the global event variables and allows
more than one event structure to be read from different files
(and different machines).

But perf still has the old global events and the code throughout
perf does not yet have a nice way to pass around a handle.
A global 'pevent' has been made for perf and the old calls have
been created as wrappers to the new event parsing code that uses
the global pevent.

With this change, perf can later incorporate the pevent handle into
the perf structures and allow more than one file to be read and
compared, that contains different events.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Arun Sharma <asharma@fb.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

1 files changed, 23 insertions, 11 deletions

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index b9592e0de8d7..29b92065b88e 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -52,6 +52,16 @@ static unsigned long	page_size;
 static ssize_t calc_data_size;
 static bool repipe;
 
+static void *malloc_or_die(int size)
+{
+        void *ret;
+
+        ret = malloc(size);
+        if (!ret)
+                die("malloc");
+        return ret;
+}
+
 static int do_read(int fd, void *buf, int size)
 {
         int rsize = size;
@@ -109,7 +119,7 @@ static unsigned int read4(void)
         unsigned int data;
 
         read_or_die(&data, 4);
-        return __data2host4(data);
+        return __data2host4(perf_pevent, data);
 }
 
 static unsigned long long read8(void)
@@ -117,7 +127,7 @@ static unsigned long long read8(void)
         unsigned long long data;
 
         read_or_die(&data, 8);
-        return __data2host8(data);
+        return __data2host8(perf_pevent, data);
 }
 
 static char *read_string(void)
@@ -389,15 +399,15 @@ struct record *trace_peek_data(int cpu)
                 /* FIXME: handle header page */
                 if (header_page_ts_size != 8)
                         die("expected a long long type for timestamp");
-                cpu_data[cpu].timestamp = data2host8(ptr);
+                cpu_data[cpu].timestamp = data2host8(perf_pevent, ptr);
                 ptr += 8;
                 switch (header_page_size_size) {
                 case 4:
-                        cpu_data[cpu].page_size = data2host4(ptr);
+                        cpu_data[cpu].page_size = data2host4(perf_pevent, ptr);
                         ptr += 4;
                         break;
                 case 8:
-                        cpu_data[cpu].page_size = data2host8(ptr);
+                        cpu_data[cpu].page_size = data2host8(perf_pevent, ptr);
                         ptr += 8;
                         break;
                 default:
@@ -414,7 +424,7 @@ read_again:
                 return trace_peek_data(cpu);
         }
 
-        type_len_ts = data2host4(ptr);
+        type_len_ts = data2host4(perf_pevent, ptr);
         ptr += 4;
 
         type_len = type_len4host(type_len_ts);
@@ -424,14 +434,14 @@ read_again:
         case RINGBUF_TYPE_PADDING:
                 if (!delta)
                         die("error, hit unexpected end of page");
-                length = data2host4(ptr);
+                length = data2host4(perf_pevent, ptr);
                 ptr += 4;
                 length *= 4;
                 ptr += length;
                 goto read_again;
 
         case RINGBUF_TYPE_TIME_EXTEND:
-                extend = data2host4(ptr);
+                extend = data2host4(perf_pevent, ptr);
                 ptr += 4;
                 extend <<= TS_SHIFT;
                 extend += delta;
@@ -442,7 +452,7 @@ read_again:
                 ptr += 12;
                 break;
         case 0:
-                length = data2host4(ptr);
+                length = data2host4(perf_pevent, ptr);
                 ptr += 4;
                 die("here! length=%d", length);
                 break;
@@ -509,6 +519,8 @@ ssize_t trace_report(int fd, bool __repipe)
         file_bigendian = buf[0];
         host_bigendian = bigendian();
 
+        read_trace_init(file_bigendian, host_bigendian);
+
         read_or_die(buf, 1);
         long_size = buf[0];
 
@@ -526,11 +538,11 @@ ssize_t trace_report(int fd, bool __repipe)
         repipe = false;
 
         if (show_funcs) {
-                print_funcs();
+                pevent_print_funcs(perf_pevent);
                 return size;
         }
         if (show_printk) {
-                print_printk();
+                pevent_print_printk(perf_pevent);
                 return size;
         }