perf tools: Merge trace.info content into perf.data

This drops the trace.info file and move its contents into the
common perf.data file.

This is done by creating a new trace_info section into this file. A
user of perf headers needs to call perf_header__set_trace_info() to
save the trace meta informations into the perf.data file.

A file created by perf after his patch is unsupported by previous
version because the size of the headers have increased.

That said, it's two new fields that have been added in the end of
the headers, and those could be ignored by previous versions if
they just handled the dynamic header size and then ignore the
unknow part. The offsets guarantee the compatibility. We'll do a
-stable fix for that.

But current previous versions handle the header size using its
static size, not dynamic, then it's not backward compatible with
trace records.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <20091006213643.GA5343@nowhere>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 42 insertions, 0 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index e306857b2c2b..212fade7ee74 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -5,6 +5,8 @@
 
 #include "util.h"
 #include "header.h"
+#include "../perf.h"
+#include "trace-event.h"
 
 /*
  * Create new perf.data header attribute:
@@ -62,6 +64,8 @@ struct perf_header *perf_header__new(void)
 
         self->data_offset = 0;
         self->data_size = 0;
+        self->trace_info_offset = 0;
+        self->trace_info_size = 0;
 
         return self;
 }
@@ -145,8 +149,16 @@ struct perf_file_header {
         struct perf_file_section        attrs;
         struct perf_file_section        data;
         struct perf_file_section        event_types;
+        struct perf_file_section        trace_info;
 };
 
+static int trace_info;
+
+void perf_header__set_trace_info(void)
+{
+        trace_info = 1;
+}
+
 static void do_write(int fd, void *buf, size_t size)
 {
         while (size) {
@@ -198,6 +210,23 @@ void perf_header__write(struct perf_header *self, int fd)
         if (events)
                 do_write(fd, events, self->event_size);
 
+        if (trace_info) {
+                static int trace_info_written;
+
+                /*
+                 * Write it only once
+                 */
+                if (!trace_info_written) {
+                        self->trace_info_offset = lseek(fd, 0, SEEK_CUR);
+                        read_tracing_data(fd, attrs, nr_counters);
+                        self->trace_info_size = lseek(fd, 0, SEEK_CUR) -
+                                                self->trace_info_offset;
+                        trace_info_written = 1;
+                } else {
+                        lseek(fd, self->trace_info_offset +
+                                self->trace_info_size, SEEK_SET);
+                }
+        }
 
         self->data_offset = lseek(fd, 0, SEEK_CUR);
 
@@ -217,6 +246,10 @@ void perf_header__write(struct perf_header *self, int fd)
                         .offset = self->event_offset,
                         .size   = self->event_size,
                 },
+                .trace_info = {
+                        .offset = self->trace_info_offset,
+                        .size = self->trace_info_size,
+                },
         };
 
         lseek(fd, 0, SEEK_SET);
@@ -290,6 +323,15 @@ struct perf_header *perf_header__read(int fd)
                 do_read(fd, events, f_header.event_types.size);
                 event_count =  f_header.event_types.size / sizeof(struct perf_trace_event_type);
         }
+
+        self->trace_info_offset = f_header.trace_info.offset;
+        self->trace_info_size = f_header.trace_info.size;
+
+        if (self->trace_info_size) {
+                lseek(fd, self->trace_info_offset, SEEK_SET);
+                trace_report(fd);
+        }
+
         self->event_offset = f_header.event_types.offset;
         self->event_size   = f_header.event_types.size;