Merge branch 'trace-cmd' into trace-view

8 files changed, 254 insertions, 145 deletions

diff --git a/.gitignore b/.gitignore
index 964dbdf..af130c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ trace-cmd
 *.a
 trace.dat
 *~
+kernelshark
+trace-graph
+trace-view
+
diff --git a/ctracecmd.i b/ctracecmd.i
index 20a681c..a9d3ca5 100644
--- a/ctracecmd.i
+++ b/ctracecmd.i
@@ -6,19 +6,21 @@
 #include "trace-cmd.h"
 %}
 
-/* typemaps must come before the implementation of wrapped functions */
-extern int pevent_read_number_field_32(struct format_field *f, void *data,
-                                       unsigned long *OUTPUT, unsigned long *OUTPUT);
+%typemap(out) unsigned long long {
+$result = PyLong_FromUnsignedLongLong((unsigned long long) $1);
+}
 
 %inline %{
-int pevent_read_number_field_32(struct format_field *f, void *data, unsigned long *hi, unsigned long *lo)
+PyObject *pevent_read_number_field_py(struct format_field *f, void *data)
 {
-        unsigned long long val64;
+        unsigned long long val;
         int ret;
-        ret = pevent_read_number_field(f, data, &val64);
-        *hi = (unsigned long)(val64>>32);
-        *lo = (unsigned long)((val64<<32)>>32);
-        return ret;
+
+        ret = pevent_read_number_field(f, data, &val);
+        if (ret)
+                Py_RETURN_NONE;
+        else
+                return PyLong_FromUnsignedLongLong(val);
 }
 %}
 
diff --git a/list.h b/list.h
new file mode 100644
index 0000000..1ddac26
--- /dev/null
+++ b/list.h
@@ -0,0 +1,47 @@
+#ifndef __LIST_H
+#define __LIST_H
+
+#define offset_of(type, field)          (long)(&((type *)0)->field)
+#define container_of(p, type, field)    (type *)((long)p - offset_of(type, field))
+
+struct list_head {
+        struct list_head *next;
+        struct list_head *prev;
+};
+
+static inline void list_head_init(struct list_head *list)
+{
+        list->next = list;
+        list->prev = list;
+}
+
+static inline void list_add(struct list_head *p, struct list_head *head)
+{
+        struct list_head *next = head->next;
+
+        p->prev = head;
+        p->next = next;
+        next->prev = p;
+        head->next = p;
+}
+
+static inline void list_del(struct list_head *p)
+{
+        struct list_head *next = p->next;
+        struct list_head *prev = p->prev;
+
+        next->prev = prev;
+        prev->next = next;
+}
+
+static inline int list_empty(struct list_head *list)
+{
+        return list->next == list;
+}
+
+#define list_for_each_entry(p, list, type, field)               \
+        for (p = container_of((list)->next, type, field);       \
+             &(p)->field != list;                               \
+             p = container_of((p)->field.next, type, field))
+
+#endif /* __LIST_H */
diff --git a/parse-events.h b/parse-events.h
index 92f174e..bfbba5c 100644
--- a/parse-events.h
+++ b/parse-events.h
@@ -15,12 +15,13 @@
 #endif
 
 struct record {
-        unsigned long long ts;
-        unsigned long long offset;
-        int record_size;                /* size of binary record */
-        int size;                       /* size of data */
-        void *data;
-        int cpu;
+        unsigned long long      ts;
+        unsigned long long      offset;
+        int                     record_size;    /* size of binary record */
+        int                     size;           /* size of data */
+        void                    *data;
+        int                     cpu;
+        void                    *private;
 };
 
 /*
diff --git a/trace-cmd.h b/trace-cmd.h
index f6141f4..d0b5c92 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -22,10 +22,7 @@ enum {
 #define TS_SHIFT                27
 #endif
 
-static inline void free_record(struct record *record)
-{
-        free(record);
-}
+void free_record(struct record *record);
 
 struct tracecmd_input;
 struct tracecmd_output;
diff --git a/trace-input.c b/trace-input.c
index 0bb750c..431c580 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -17,10 +17,19 @@
 #include <errno.h>
 
 #include "trace-cmd.h"
+#include "list.h"
 
 /* for debugging read instead of mmap */
 static int force_read = 0;
 
+struct page {
+        struct list_head        list;
+        off64_t                 offset;
+        struct tracecmd_input   *handle;
+        void                    *map;
+        int                     ref_count;
+};
+
 struct cpu_data {
         /* the first two never change */
         unsigned long long      file_offset;
@@ -28,28 +37,27 @@ struct cpu_data {
         unsigned long long      offset;
         unsigned long long      size;
         unsigned long long      timestamp;
+        struct list_head        pages;
         struct record           *next;
-        char                    *page;
-        void                    *read_page;
+        struct page             *page;
         int                     cpu;
         int                     index;
         int                     page_size;
 };
 
 struct tracecmd_input {
-        struct pevent   *pevent;
-        int             fd;
-        int             long_size;
-        int             page_size;
-        int             read_page;
-        int             cpus;
-        struct cpu_data *cpu_data;
+        struct pevent           *pevent;
+        int                     fd;
+        int                     long_size;
+        int                     page_size;
+        int                     read_page;
+        int                     cpus;
+        struct cpu_data         *cpu_data;
 
         /* file information */
-        size_t          header_files_start;
-        size_t          ftrace_files_start;
-        size_t          event_files_start;
-        
+        size_t                  header_files_start;
+        size_t                  ftrace_files_start;
+        size_t                  event_files_start;
 };
 
 __thread struct tracecmd_input *tracecmd_curr_thread_handle;
@@ -109,7 +117,7 @@ static char *read_string(struct tracecmd_input *handle)
                 }
                 if (i < r)
                         break;
-                        
+
                 if (str) {
                         size += BUFSIZ;
                         str = realloc(str, size);
@@ -121,7 +129,7 @@ static char *read_string(struct tracecmd_input *handle)
                         str = malloc(size);
                         if (!str)
                                 return NULL;
-                        memcpy(str, buf, size); 
+                        memcpy(str, buf, size);
                 }
         }
 
@@ -504,7 +512,97 @@ static unsigned int read_type_len_ts(s