perf utils: Use a define for the maximum length of a trace event

[safe/jmp/linux-2.6] / tools / perf / util / header.c

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 95a44bc..bb4fca3 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -7,9 +7,8 @@
 #include "header.h"
 
 /*
- *
+ * Create new perf.data header attribute:
  */
-
 struct perf_header_attr *perf_header_attr__new(struct perf_counter_attr *attr)
 {
        struct perf_header_attr *self = malloc(sizeof(*self));
@@ -43,9 +42,8 @@ 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));
@@ -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)
+               printf("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)
@@ -106,6 +144,7 @@ struct perf_file_header {
        u64                             attr_size;
        struct perf_file_section        attrs;
        struct perf_file_section        data;
+       struct perf_file_section        event_types;
 };
 
 static void do_write(int fd, void *buf, size_t size)
@@ -154,6 +193,11 @@ 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);
 
@@ -169,6 +213,10 @@ 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,
+               },
        };
 
        lseek(fd, 0, SEEK_SET);
@@ -185,6 +233,8 @@ static void do_read(int fd, void *buf, size_t size)
 
                if (ret < 0)
                        die("failed to read");
+               if (ret == 0)
+                       die("failed to read: missing data");
 
                size -= ret;
                buf += ret;
@@ -232,12 +282,58 @@ 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);
+       }
+       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);
+       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_counter_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;
+}