2 files changed, 259 insertions, 96 deletions

diff --git a/trace-local.h b/trace-local.h
index 73c38d2..72f6450 100644
--- a/trace-local.h
+++ b/trace-local.h
@@ -33,7 +33,7 @@ void usage(char **argv);
 extern int silence_warnings;
 extern int show_status;
 
-struct tracecmd_input *read_trace_header(void);
+struct tracecmd_input *read_trace_header(const char *file);
 int read_trace_files(void);
 
 void trace_report(int argc, char **argv);
diff --git a/trace-read.c b/trace-read.c
index 326054e..0e9ced8 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -39,6 +39,7 @@
 
 #include "trace-local.h"
 #include "trace-hash-local.h"
+#include "list.h"
 
 static struct filter {
         struct filter           *next;
@@ -47,13 +48,30 @@ static struct filter {
 } *filter_strings;
 static struct filter **filter_next = &filter_strings;
 
-static struct event_filter *event_filters;
-static struct event_filter *event_filter_out;
+struct handle_list {
+        struct list_head        list;
+        struct tracecmd_input   *handle;
+        const char              *file;
+        int                     cpus;
+        int                     done;
+        struct record           *record;
+        struct event_filter     *event_filters;
+        struct event_filter     *event_filter_out;
+};
+static struct list_head handle_list;
+
+struct input_files {
+        struct list_head        list;
+        const char              *file;
+};
+static struct list_head input_files;
 
 static unsigned int page_size;
 static int input_fd;
-const char *default_input_file = "trace.dat";
-const char *input_file;
+static const char *default_input_file = "trace.dat";
+static const char *input_file;
+static int multi_inputs;
+static int max_file_size;
 
 static int filter_cpu = -1;
 static int *filter_cpus;
@@ -231,6 +249,55 @@ static void test_save(struct record *record, int cpu)
 }
 #endif
 
+static void add_input(const char *file)
+{
+        struct input_files *item;
+
+        item = malloc_or_die(sizeof(*item));
+        item->file = file;
+        list_add_tail(&item->list, &input_files);
+}
+
+static void add_handle(struct tracecmd_input *handle, const char *file)
+{
+        struct handle_list *item;
+
+        item = malloc_or_die(sizeof(*item));
+        memset(item, 0, sizeof(*item));
+        item->handle = handle;
+        item->file = file + strlen(file);
+        /* we want just the base name */
+        while (*item->file != '/' && item->file >= file)
+                item->file--;
+        item->file++;
+        if (strlen(item->file) > max_file_size)
+                max_file_size = strlen(item->file);
+
+        list_add_tail(&item->list, &handle_list);
+}
+
+static void free_inputs(void)
+{
+        struct input_files *item;
+
+        while (!list_empty(&input_files)) {
+                item = container_of(input_files.next, struct input_files, list);
+                list_del(&item->list);
+                free(item);
+        }
+}
+
+static void free_handles(void)
+{
+        struct handle_list *item;
+
+        while (!list_empty(&handle_list)) {
+                item = container_of(handle_list.next, struct handle_list, list);
+                list_del(&item->list);
+                free(item);
+        }
+}
+
 static void add_filter(const char *filter, int neg)
 {
         struct filter *ftr;
@@ -245,7 +312,7 @@ static void add_filter(const char *filter, int neg)
         filter_next = &ftr->next;
 }
 
-static void process_filters(struct tracecmd_input *handle)
+static void process_filters(struct handle_list *handles)
 {
         struct event_filter *event_filter;
         struct pevent *pevent;
@@ -253,17 +320,17 @@ static void process_filters(struct tracecmd_input *handle)
         char *errstr;
         int ret;
 
-        pevent = tracecmd_get_pevent(handle);
-        event_filters = pevent_filter_alloc(pevent);
-        event_filter_out = pevent_filter_alloc(pevent);
+        pevent = tracecmd_get_pevent(handles->handle);
+        handles->event_filters = pevent_filter_alloc(pevent);
+        handles->event_filter_out = pevent_filter_alloc(pevent);
 
         while (filter_strings) {
                 filter = filter_strings;
                 filter_strings = filter->next;
                 if (filter->neg)
-                        event_filter = event_filter_out;
+                        event_filter = handles->event_filter_out;
                 else
-                        event_filter = event_filters;
+                        event_filter = handles->event_filters;
 
                 ret = pevent_filter_add_filter_str(event_filter,
                                                    filter->filter,
@@ -515,30 +582,21 @@ static void read_rest(void)
         } while (r > 0);
 }
 
-static void read_data_info(struct tracecmd_input *handle)
+static struct record *
+get_next_record(struct handle_list *handles, int *next_cpu)
 {
         unsigned long long ts;
         struct record *record;
-        int cpus;
+        int found = 0;
         int next;
         int cpu;
         int ret;
 
-        ret = tracecmd_init_data(handle);
-        if (ret < 0)
-                die("failed to init data");
-
-        cpus = tracecmd_cpus(handle);
-        printf("cpus=%d\n", cpus);
-
-        /* Latency trace is just all ASCII */
-        if (ret > 0) {
-                read_rest();
-                return;
-        }
+        if (handles->record)
+                return handles->record;
 
-        init_wakeup(handle);
-        process_filters(handle);
+        if (handles->done)
+                return NULL;
 
         do {
                 next = -1;
@@ -550,7 +608,7 @@ static void read_data_info(struct tracecmd_input *handle)
                         int i;
 
                         for (i = 0; (cpu = filter_cpus[i]) >= 0; i++) {
-                                precord = tracecmd_peek_data(handle, cpu);
+                                precord = tracecmd_peek_data(handles->handle, cpu);
                                 if (precord &&
                                     (!last_stamp || precord->ts < last_stamp)) {
                                         next_cpu = cpu;
@@ -558,41 +616,123 @@ static void read_data_info(struct tracecmd_input *handle)
                                 }
                         }
                         if (last_stamp)
-                                record = tracecmd_read_data(handle, next_cpu);
+                                record = tracecmd_read_data(handles->handle, next_cpu);
                         else
                                 record = NULL;
 
                 } else if (filter_cpu >= 0) {
                         cpu = filter_cpu;
-                        record = tracecmd_read_data(handle, cpu);
+                        record = tracecmd_read_data(handles->handle, cpu);
                 } else
-                        record = tracecmd_read_next_data(handle, &cpu);
+                        record = tracecmd_read_next_data(handles->handle, &cpu);
 
                 if (record) {
-                        ret = pevent_filter_match(event_filters, record);
+                        ret = pevent_filter_match(