9 files changed, 543 insertions, 322 deletions

diff --git a/parse-events.c b/parse-events.c
index 8a59433..fe683c9 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -30,27 +30,10 @@
 
 #include "parse-events.h"
 
-int header_page_ts_offset;
-int header_page_ts_size;
-int header_page_size_offset;
-int header_page_size_size;
-int header_page_data_offset;
-int header_page_data_size;
-
-int file_bigendian;
-int host_bigendian;
-
-int latency_format;
-
-int old_format;
-
 static char *input_buf;
 static unsigned long long input_buf_ptr;
 static unsigned long long input_buf_siz;
 
-static int cpus;
-static int long_size;
-
 static void init_input_buf(char *buf, unsigned long long size)
 {
         input_buf = buf;
@@ -69,9 +52,6 @@ struct cmdline {
         int pid;
 };
 
-static struct cmdline *cmdlines;
-static int cmdline_count;
-
 static int cmdline_cmp(const void *a, const void *b)
 {
         const struct cmdline *ca = a;
@@ -85,18 +65,20 @@ static int cmdline_cmp(const void *a, const void *b)
         return 0;
 }
 
-static struct cmdline_list {
+struct cmdline_list {
         struct cmdline_list     *next;
         char                    *comm;
         int                     pid;
-} *cmdlist;
+};
 
-static int cmdline_init(void)
+static int cmdline_init(struct pevent *pevent)
 {
+        struct cmdline_list *cmdlist = pevent->cmdlist;
         struct cmdline_list *item;
+        struct cmdline *cmdlines;
         int i;
 
-        cmdlines = malloc_or_die(sizeof(*cmdlines) * cmdline_count);
+        cmdlines = malloc_or_die(sizeof(*cmdlines) * pevent->cmdline_count);
 
         i = 0;
         while (cmdlist) {
@@ -108,12 +90,15 @@ static int cmdline_init(void)
                 free(item);
         }
 
-        qsort(cmdlines, cmdline_count, sizeof(*cmdlines), cmdline_cmp);
+        qsort(cmdlines, pevent->cmdline_count, sizeof(*cmdlines), cmdline_cmp);
+
+        pevent->cmdlines = cmdlines;
+        pevent->cmdlist = NULL;
 
         return 0;
 }
 
-static char *find_cmdline(int pid)
+static char *find_cmdline(struct pevent *pevent, int pid)
 {
         const struct cmdline *comm;
         struct cmdline key;
@@ -121,47 +106,46 @@ static char *find_cmdline(int pid)
         if (!pid)
                 return "<idle>";
 
-        if (!cmdlines)
-                cmdline_init();
+        if (!pevent->cmdlines)
+                cmdline_init(pevent);
 
         key.pid = pid;
 
-        comm = bsearch(&key, cmdlines, cmdline_count, sizeof(*cmdlines),
-                       cmdline_cmp);
+        comm = bsearch(&key, pevent->cmdlines, pevent->cmdline_count,
+                       sizeof(*pevent->cmdlines), cmdline_cmp);
 
         if (comm)
                 return comm->comm;
         return "<...>";
 }
 
-int pevent_register_comm(char *comm, int pid)
+int pevent_register_comm(struct pevent *pevent, char *comm, int pid)
 {
         struct cmdline_list *item;
 
         item = malloc_or_die(sizeof(*item));
         item->comm = comm;
         item->pid = pid;
-        item->next = cmdlist;
+        item->next = pevent->cmdlist;
 
-        cmdlist = item;
-        cmdline_count++;
+        pevent->cmdlist = item;
+        pevent->cmdline_count++;
 
         return 0;
 }
 
-static struct func_map {
+struct func_map {
         unsigned long long              addr;
         char                            *func;
         char                            *mod;
-} *func_map;
-static unsigned int func_count;
+};
 
-static struct func_list {
+struct func_list {
         struct func_list        *next;
         unsigned long long      addr;
         char                    *func;
         char                    *mod;
-} *funclist;
+};
 
 static int func_cmp(const void *a, const void *b)
 {
@@ -197,12 +181,15 @@ static int func_bcmp(const void *a, const void *b)
         return 1;
 }
 
-static int func_map_init(void)
+static int func_map_init(struct pevent *pevent)
 {
+        struct func_list *funclist;
         struct func_list *item;
+        struct func_map *func_map;
         int i;
 
-        func_map = malloc_or_die(sizeof(*func_map) * func_count + 1);
+        func_map = malloc_or_die(sizeof(*func_map) * pevent->func_count + 1);
+        funclist = pevent->funclist;
 
         i = 0;
         while (funclist) {
@@ -215,90 +202,96 @@ static int func_map_init(void)
                 free(item);
         }
 
-        qsort(func_map, func_count, sizeof(*func_map), func_cmp);
+        qsort(func_map, pevent->func_count, sizeof(*func_map), func_cmp);
 
         /*
          * Add a special record at the end.
          */
-        func_map[func_count].func = NULL;
-        func_map[func_count].addr = 0;
-        func_map[func_count].mod = NULL;
+        func_map[pevent->func_count].func = NULL;
+        func_map[pevent->func_count].addr = 0;
+        func_map[pevent->func_count].mod = NULL;
+
+        pevent->func_map = func_map;
+        pevent->funclist = NULL;
 
         return 0;
 }
 
-static struct func_map *find_func(unsigned long long addr)
+static struct func_map *
+find_func(struct pevent *pevent, unsigned long long addr)
 {
         struct func_map *func;
         struct func_map key;
 
-        if (!func_map)
-                func_map_init();
+        if (!pevent->func_map)
+                func_map_init(pevent);