trace-cmd: Move merge sort of reading records into library

The merge sort of reading the record timestamps and ording the
records by time, regardless of CPU, has been moved from the
trace-cmd.c file into the libtracecmd library code trace-input.c.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

3 files changed, 61 insertions, 20 deletions

diff --git a/trace-cmd.h b/trace-cmd.h
index 3639fdd..13d913a 100644
--- a/trace-cmd.h
+++ b/trace-cmd.h
@@ -61,6 +61,9 @@ struct record *
 tracecmd_read_data(struct tracecmd_input *handle, int cpu);
 
 struct record *
+tracecmd_read_next_data(struct tracecmd_input *handle, int *rec_cpu);
+
+struct record *
 tracecmd_read_at(struct tracecmd_input *handle, unsigned long long offset,
                  int *cpu);
 struct record *
diff --git a/trace-input.c b/trace-input.c
index dc1167a..ece0aab 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -1339,6 +1339,54 @@ tracecmd_read_data(struct tracecmd_input *handle, int cpu)
         return record;
 }
 
+/**
+ * tracecmd_read_next_data - read the next record
+ * @handle: input handle to the trace.dat file
+ * @rec_cpu: return pointer to the CPU that the record belongs to
+ *
+ * This returns the next record by time. This is different than
+ * tracecmd_read_data in that it looks at all CPUs. It does a peek
+ * at each CPU and the record with the earliest time stame is
+ * returned. If @rec_cpu is not NULL it gets the CPU id the record was
+ * on. The CPU cursor of the returned record is moved to the
+ * next record.
+ *
+ * Multiple reads of this function will return a serialized list
+ * of all records for all CPUs in order of time stamp.
+ *
+ * The record returned must be freed.
+ */
+struct record *
+tracecmd_read_next_data(struct tracecmd_input *handle, int *rec_cpu)
+{
+        unsigned long long ts;
+        struct record *record;
+        int next;
+        int cpu;
+
+        if (rec_cpu)
+                *rec_cpu = -1;
+
+        next = -1;
+        ts = 0;
+
+        for (cpu = 0; cpu < handle->cpus; cpu++) {
+                record = tracecmd_peek_data(handle, cpu);
+                if (record && (!ts || record->ts < ts)) {
+                        ts = record->ts;
+                        next = cpu;
+                }
+        }
+
+        if (next >= 0) {
+                if (rec_cpu)
+                        *rec_cpu = next;
+                return tracecmd_read_data(handle, next);
+        }
+
+        return NULL;
+}
+
 static int init_cpu(struct tracecmd_input *handle, int cpu)
 {
         struct cpu_data *cpu_data = &handle->cpu_data[cpu];
diff --git a/trace-read.c b/trace-read.c
index 306fa3a..a04c85b 100644
--- a/trace-read.c
+++ b/trace-read.c
@@ -189,16 +189,14 @@ static void test_save(struct record *record, int cpu)
 }
 #endif
 
-static void show_data(struct tracecmd_input *handle, int cpu)
+static void show_data(struct tracecmd_input *handle,
+                      struct record *record, int cpu)
 {
         struct pevent *pevent;
-        struct record *record;
         struct trace_seq s;
 
         pevent = tracecmd_get_pevent(handle);
 
-        record = tracecmd_read_data(handle, cpu);
-
         test_save(record, cpu);
 
         trace_seq_init(&s);
@@ -226,7 +224,7 @@ static void read_rest(void)
 static void read_data_info(struct tracecmd_input *handle)
 {
         unsigned long long ts;
-        struct record *data;
+        struct record *record;
         int cpus;
         int next;
         int cpu;
@@ -250,22 +248,14 @@ static void read_data_info(struct tracecmd_input *handle)
                 ts = 0;
                 if (filter_cpu >= 0) {
                         cpu = filter_cpu;
-                        data = tracecmd_peek_data(handle, cpu);
-                        if (data)
-                                next = cpu;
-                } else {
-                        for (cpu = 0; cpu < cpus; cpu++) {
-                                data = tracecmd_peek_data(handle, cpu);
-                                if (data && (!ts || data->ts < ts)) {
-                                        ts = data->ts;
-                                        next = cpu;
-                                }
-                        }
-                }
-                if (next >= 0)
-                        show_data(handle, next);
+                        record = tracecmd_peek_data(handle, cpu);
+                } else
+                        record = tracecmd_read_next_data(handle, &cpu);
+
+                if (record)
+                        show_data(handle, record, next);
 
-        } while (next >= 0);
+        } while (record);
 
         show_test(handle);
 }