remove more common code

4 files changed, 50 insertions, 57 deletions

diff --git a/include/load.h b/include/load.h
index a7a242d..0da9886 100644
--- a/include/load.h
+++ b/include/load.h
@@ -2,5 +2,6 @@
 #define LOAD_H
 
 int map_trace(const char *name, void **start, void **end, size_t *size);
+struct heap* load(char **files, int no_files, unsigned int *count);
 
 #endif
diff --git a/src/load.c b/src/load.c
index 9203fde..3dce8de 100644
--- a/src/load.c
+++ b/src/load.c
@@ -4,6 +4,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <stdio.h>
+
+#include "sched_trace.h"
+#include "eheap.h"
 
 static int map_file(const char* filename, void **addr, size_t *size)
 {
@@ -40,3 +44,36 @@ int map_trace(const char *name, void **start, void **end, size_t *size)
                 *end = *start + *size;
         return ret;
 }
+
+
+static struct heap* heap_from_file(char* file, unsigned int* count)
+{
+        size_t s;
+        struct st_event_record *rec, *end;
+        if (map_trace(file, (void**) &rec, (void**) &end, &s) == 0) {
+                *count = ((unsigned int)((char*) end - (char*) rec))
+                        / sizeof(struct st_event_record);
+                return heapify_events(rec, *count);
+        } else
+                perror("mmap");
+        return NULL;
+}
+
+struct heap* load(char **files, int no_files, unsigned int *count)
+{
+        int i;
+        unsigned int c;
+        struct heap *h = NULL, *h2;
+        for (i = 0; i < no_files; i++) {
+                h2 = heap_from_file(files[i], &c);
+                if (!h2)
+                        /* potential memory leak, don't care */
+                        return NULL;
+                if (h)
+                        heap_union(earlier_event, h, h2);
+                else
+                        h = h2;
+                *count += c;
+        }
+        return h;
+}
diff --git a/src/showst.c b/src/showst.c
index 2767404..6ef3e1f 100644
--- a/src/showst.c
+++ b/src/showst.c
@@ -5,41 +5,18 @@
 #include "sched_trace.h"
 #include "eheap.h"
 
-static struct heap* file2heap(char* file, unsigned int* count)
-{
-        size_t s;
-        struct st_event_record *rec, *end;
-        if (map_trace(file, (void**) &rec, (void**) &end, &s) == 0) {
-                *count = ((unsigned int)((char*) end - (char*) rec))
-                        / sizeof(struct st_event_record);
-                return heapify_events(rec, *count);
-        } else
-                perror("mmap");
-        return NULL;
-}
-
 int main(int argc, char** argv)
 {
-        int i;
         unsigned int count;
-        struct heap h, *h2;
+        struct heap *h;
         struct heap_node *hn;
         u64 start_time = 0, time;
 
-        heap_init(&h);
-
-        for (i = 1; i < argc; i++) {
-                printf("Heapify %s ", argv[i]);
-                h2 = file2heap(argv[i], &count);
-                if (h2) {
-                        printf("merging ");
-                        heap_union(earlier_event, &h, h2);
-                        printf("done [%u events].\n", count);
-                } else
-                        printf("failed.\n");
-        }
-
-        while ((hn = heap_take(earlier_event, &h))) {
+        h = load(argv + 1, argc - 1, &count);
+        if (!h)
+                return 1;
+        printf("Loaded %u events.\n", count);
+        while ((hn = heap_take(earlier_event, h))) {
                 time =  event_time(heap_node_value(hn));
                 if (!start_time && time)
                         start_time = time;
diff --git a/src/st2asy.c b/src/st2asy.c
index 2767404..090b374 100644
--- a/src/st2asy.c
+++ b/src/st2asy.c
@@ -5,41 +5,19 @@
 #include "sched_trace.h"
 #include "eheap.h"
 
-static struct heap* file2heap(char* file, unsigned int* count)
-{
-        size_t s;
-        struct st_event_record *rec, *end;
-        if (map_trace(file, (void**) &rec, (void**) &end, &s) == 0) {
-                *count = ((unsigned int)((char*) end - (char*) rec))
-                        / sizeof(struct st_event_record);
-                return heapify_events(rec, *count);
-        } else
-                perror("mmap");
-        return NULL;
-}
 
 int main(int argc, char** argv)
 {
-        int i;
         unsigned int count;
-        struct heap h, *h2;
+        struct heap *h;
         struct heap_node *hn;
         u64 start_time = 0, time;
 
-        heap_init(&h);
-
-        for (i = 1; i < argc; i++) {
-                printf("Heapify %s ", argv[i]);
-                h2 = file2heap(argv[i], &count);
-                if (h2) {
-                        printf("merging ");
-                        heap_union(earlier_event, &h, h2);
-                        printf("done [%u events].\n", count);
-                } else
-                        printf("failed.\n");
-        }
-
-        while ((hn = heap_take(earlier_event, &h))) {
+        h = load(argv + 1, argc - 1, &count);
+        if (!h)
+                return 1;
+        printf("Loaded %u events.\n", count);
+        while ((hn = heap_take(earlier_event, h))) {
                 time =  event_time(heap_node_value(hn));
                 if (!start_time && time)
                         start_time = time;