]> Pileus Git - ~andy/linux/blobdiff - tools/perf/util/header.c
perf tools: Bring linear set of section headers for features
[~andy/linux] / tools / perf / util / header.c
index b92a457ca32e2eb156f8f9f3311e281579171a99..ebed4f44ed36f8dff5641a0655956dcdc495088e 100644 (file)
@@ -2,15 +2,20 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <linux/list.h>
 
 #include "util.h"
 #include "header.h"
+#include "../perf.h"
+#include "trace-event.h"
+#include "symbol.h"
+#include "data_map.h"
+#include "debug.h"
 
 /*
- *
+ * Create new perf.data header attribute:
  */
-
-struct perf_header_attr *perf_header_attr__new(struct perf_counter_attr *attr)
+struct perf_header_attr *perf_header_attr__new(struct perf_event_attr *attr)
 {
        struct perf_header_attr *self = malloc(sizeof(*self));
 
@@ -43,28 +48,21 @@ void perf_header_attr__add_id(struct perf_header_attr *self, u64 id)
 }
 
 /*
- *
+ * Create new perf.data header:
  */
-
 struct perf_header *perf_header__new(void)
 {
-       struct perf_header *self = malloc(sizeof(*self));
+       struct perf_header *self = calloc(sizeof(*self), 1);
 
        if (!self)
                die("nomem");
 
-       self->frozen = 0;
-
-       self->attrs = 0;
        self->size = 1;
        self->attr = malloc(sizeof(void *));
 
        if (!self->attr)
                die("nomem");
 
-       self->data_offset = 0;
-       self->data_size = 0;
-
        return self;
 }
 
@@ -86,6 +84,46 @@ void perf_header__add_attr(struct perf_header *self,
        self->attr[pos] = attr;
 }
 
+#define MAX_EVENT_NAME 64
+
+struct perf_trace_event_type {
+       u64     event_id;
+       char    name[MAX_EVENT_NAME];
+};
+
+static int event_count;
+static struct perf_trace_event_type *events;
+
+void perf_header__push_event(u64 id, const char *name)
+{
+       if (strlen(name) > MAX_EVENT_NAME)
+               pr_warning("Event %s will be truncated\n", name);
+
+       if (!events) {
+               events = malloc(sizeof(struct perf_trace_event_type));
+               if (!events)
+                       die("nomem");
+       } else {
+               events = realloc(events, (event_count + 1) * sizeof(struct perf_trace_event_type));
+               if (!events)
+                       die("nomem");
+       }
+       memset(&events[event_count], 0, sizeof(struct perf_trace_event_type));
+       events[event_count].event_id = id;
+       strncpy(events[event_count].name, name, MAX_EVENT_NAME - 1);
+       event_count++;
+}
+
+char *perf_header__find_event(u64 id)
+{
+       int i;
+       for (i = 0 ; i < event_count; i++) {
+               if (events[i].event_id == id)
+                       return events[i].name;
+       }
+       return NULL;
+}
+
 static const char *__perf_magic = "PERFFILE";
 
 #define PERF_MAGIC     (*(u64 *)__perf_magic)
@@ -96,7 +134,7 @@ struct perf_file_section {
 };
 
 struct perf_file_attr {
-       struct perf_counter_attr        attr;
+       struct perf_event_attr  attr;
        struct perf_file_section        ids;
 };
 
@@ -106,8 +144,20 @@ struct perf_file_header {
        u64                             attr_size;
        struct perf_file_section        attrs;
        struct perf_file_section        data;
+       struct perf_file_section        event_types;
+       DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
 };
 
+void perf_header__set_feat(struct perf_header *self, int feat)
+{
+       set_bit(feat, self->adds_features);
+}
+
+bool perf_header__has_feat(const struct perf_header *self, int feat)
+{
+       return test_bit(feat, self->adds_features);
+}
+
 static void do_write(int fd, void *buf, size_t size)
 {
        while (size) {
@@ -121,7 +171,75 @@ static void do_write(int fd, void *buf, size_t size)
        }
 }
 
-void perf_header__write(struct perf_header *self, int fd)
+static void write_buildid_table(int fd, struct list_head *id_head)
+{
+       struct build_id_list *iter, *next;
+
+       list_for_each_entry_safe(iter, next, id_head, list) {
+               struct build_id_event *b = &iter->event;
+
+               do_write(fd, b, sizeof(*b));
+               do_write(fd, (void *)iter->dso_name, iter->len);
+               list_del(&iter->list);
+               free(iter);
+       }
+}
+
+static void
+perf_header__adds_write(struct perf_header *self, int fd)
+{
+       LIST_HEAD(id_list);
+       int nr_sections;
+       struct perf_file_section *feat_sec;
+       int sec_size;
+       u64 sec_start;
+       int idx = 0;
+
+       if (fetch_build_id_table(&id_list))
+               perf_header__set_feat(self, HEADER_BUILD_ID);
+
+       nr_sections = bitmap_weight(self->adds_features, HEADER_FEAT_BITS);
+       if (!nr_sections)
+               return;
+
+       feat_sec = calloc(sizeof(*feat_sec), nr_sections);
+       if (!feat_sec)
+               die("No memory");
+
+       sec_size = sizeof(*feat_sec) * nr_sections;
+
+       sec_start = self->data_offset + self->data_size;
+       lseek(fd, sec_start + sec_size, SEEK_SET);
+
+       if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
+               struct perf_file_section *trace_sec;
+
+               trace_sec = &feat_sec[idx++];
+
+               /* Write trace info */
+               trace_sec->offset = lseek(fd, 0, SEEK_CUR);
+               read_tracing_data(fd, attrs, nr_counters);
+               trace_sec->size = lseek(fd, 0, SEEK_CUR) - trace_sec->offset;
+       }
+
+
+       if (perf_header__has_feat(self, HEADER_BUILD_ID)) {
+               struct perf_file_section *buildid_sec;
+
+               buildid_sec = &feat_sec[idx++];
+
+               /* Write build-ids */
+               buildid_sec->offset = lseek(fd, 0, SEEK_CUR);
+               write_buildid_table(fd, &id_list);
+               buildid_sec->size = lseek(fd, 0, SEEK_CUR) - buildid_sec->offset;
+       }
+
+       lseek(fd, sec_start, SEEK_SET);
+       do_write(fd, feat_sec, sec_size);
+       free(feat_sec);
+}
+
+void perf_header__write(struct perf_header *self, int fd, bool at_exit)
 {
        struct perf_file_header f_header;
        struct perf_file_attr   f_attr;
@@ -154,9 +272,16 @@ void perf_header__write(struct perf_header *self, int fd)
                do_write(fd, &f_attr, sizeof(f_attr));
        }
 
+       self->event_offset = lseek(fd, 0, SEEK_CUR);
+       self->event_size = event_count * sizeof(struct perf_trace_event_type);
+       if (events)
+               do_write(fd, events, self->event_size);
 
        self->data_offset = lseek(fd, 0, SEEK_CUR);
 
+       if (at_exit)
+               perf_header__adds_write(self, fd);
+
        f_header = (struct perf_file_header){
                .magic     = PERF_MAGIC,
                .size      = sizeof(f_header),
@@ -169,8 +294,14 @@ void perf_header__write(struct perf_header *self, int fd)
                        .offset = self->data_offset,
                        .size   = self->data_size,
                },
+               .event_types = {
+                       .offset = self->event_offset,
+                       .size   = self->event_size,
+               },
        };
 
+       memcpy(&f_header.adds_features, &self->adds_features, sizeof(self->adds_features));
+
        lseek(fd, 0, SEEK_SET);
        do_write(fd, &f_header, sizeof(f_header));
        lseek(fd, self->data_offset + self->data_size, SEEK_SET);
@@ -193,6 +324,48 @@ static void do_read(int fd, void *buf, size_t size)
        }
 }
 
+static void perf_header__adds_read(struct perf_header *self, int fd)
+{
+       struct perf_file_section *feat_sec;
+       int nr_sections;
+       int sec_size;
+       int idx = 0;
+
+
+       nr_sections = bitmap_weight(self->adds_features, HEADER_FEAT_BITS);
+       if (!nr_sections)
+               return;
+
+       feat_sec = calloc(sizeof(*feat_sec), nr_sections);
+       if (!feat_sec)
+               die("No memory");
+
+       sec_size = sizeof(*feat_sec) * nr_sections;
+
+       lseek(fd, self->data_offset + self->data_size, SEEK_SET);
+
+       do_read(fd, feat_sec, sec_size);
+
+       if (perf_header__has_feat(self, HEADER_TRACE_INFO)) {
+               struct perf_file_section *trace_sec;
+
+               trace_sec = &feat_sec[idx++];
+               lseek(fd, trace_sec->offset, SEEK_SET);
+               trace_report(fd);
+       }
+
+       if (perf_header__has_feat(self, HEADER_BUILD_ID)) {
+               struct perf_file_section *buildid_sec;
+
+               buildid_sec = &feat_sec[idx++];
+               lseek(fd, buildid_sec->offset, SEEK_SET);
+               if (perf_header__read_build_ids(fd, buildid_sec->size))
+                       pr_debug("failed to read buildids, continuing...\n");
+       }
+
+       free(feat_sec);
+};
+
 struct perf_header *perf_header__read(int fd)
 {
        struct perf_header      *self = perf_header__new();
@@ -206,10 +379,16 @@ struct perf_header *perf_header__read(int fd)
        do_read(fd, &f_header, sizeof(f_header));
 
        if (f_header.magic      != PERF_MAGIC           ||
-           f_header.size       != sizeof(f_header)     ||
            f_header.attr_size  != sizeof(f_attr))
                die("incompatible file format");
 
+       if (f_header.size != sizeof(f_header)) {
+               /* Support the previous format */
+               if (f_header.size == offsetof(typeof(f_header), adds_features))
+                       bitmap_zero(f_header.adds_features, HEADER_FEAT_BITS);
+               else
+                       die("incompatible file format");
+       }
        nr_attrs = f_header.attrs.size / sizeof(f_attr);
        lseek(fd, f_header.attrs.offset, SEEK_SET);
 
@@ -234,12 +413,63 @@ struct perf_header *perf_header__read(int fd)
                lseek(fd, tmp, SEEK_SET);
        }
 
+       if (f_header.event_types.size) {
+               lseek(fd, f_header.event_types.offset, SEEK_SET);
+               events = malloc(f_header.event_types.size);
+               if (!events)
+                       die("nomem");
+               do_read(fd, events, f_header.event_types.size);
+               event_count =  f_header.event_types.size / sizeof(struct perf_trace_event_type);
+       }
+
+       memcpy(&self->adds_features, &f_header.adds_features, sizeof(f_header.adds_features));
+
+       self->event_offset = f_header.event_types.offset;
+       self->event_size   = f_header.event_types.size;
+
        self->data_offset = f_header.data.offset;
        self->data_size   = f_header.data.size;
 
-       lseek(fd, self->data_offset + self->data_size, SEEK_SET);
+       perf_header__adds_read(self, fd);
+
+       lseek(fd, self->data_offset, SEEK_SET);
 
        self->frozen = 1;
 
        return self;
 }
+
+u64 perf_header__sample_type(struct perf_header *header)
+{
+       u64 type = 0;
+       int i;
+
+       for (i = 0; i < header->attrs; i++) {
+               struct perf_header_attr *attr = header->attr[i];
+
+               if (!type)
+                       type = attr->attr.sample_type;
+               else if (type != attr->attr.sample_type)
+                       die("non matching sample_type");
+       }
+
+       return type;
+}
+
+struct perf_event_attr *
+perf_header__find_attr(u64 id, struct perf_header *header)
+{
+       int i;
+
+       for (i = 0; i < header->attrs; i++) {
+               struct perf_header_attr *attr = header->attr[i];
+               int j;
+
+               for (j = 0; j < attr->ids; j++) {
+                       if (attr->id[j] == id)
+                               return &attr->attr;
+               }
+       }
+
+       return NULL;
+}