Connect the trace_view_store to the trace view tree

This patch replaces the list store used for the main trace tree with
the trace_view_store.

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

2 files changed, 24 insertions, 29 deletions

diff --git a/trace-view-store.c b/trace-view-store.c
index 55bf2e7..6d3cfaf 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -373,7 +373,7 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
 
         pevent = tracecmd_get_pevent(trace_view_store->handle);
 
-        record = *(TraceViewRecord**)iter->user_data;
+        record = (TraceViewRecord*)iter->user_data;
 
         g_return_if_fail ( record != NULL );
 
@@ -430,7 +430,7 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
                 switch (column) {
                 case TRACE_VIEW_STORE_COL_COMM:
                 case TRACE_VIEW_STORE_COL_PID:
-                        val = pevent_data_pid(pevent, data);
+                        val = pevent_data_pid(pevent, data->data);
                         if (column == TRACE_VIEW_STORE_COL_PID)
                                 g_value_set_uint(value, val);
                         else {
@@ -447,7 +447,7 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
 
                 case TRACE_VIEW_STORE_COL_EVENT:
                 case TRACE_VIEW_STORE_COL_INFO:
-                        val = pevent_data_type(pevent, data);
+                        val = pevent_data_type(pevent, data->data);
                         event = pevent_data_event_from_type(pevent, val);
                         if (column == TRACE_VIEW_STORE_COL_EVENT) {
                                 g_value_set_string(value, event->name);
@@ -456,7 +456,7 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
 
                         
                         trace_seq_init(&s);
-                        pevent_event_info(&s, event, cpu, data, data->size,
+                        pevent_event_info(&s, event, cpu, data->data, data->size,
                                           record->timestamp);
                         g_value_set_string(value, s.buffer);
                         break;
@@ -736,19 +736,20 @@ trace_view_store_new (struct tracecmd_input *handle)
                 list = NULL;
                 next = &list;
 
-                do {
+                for (;;) {
                         data = tracecmd_read_data(handle, cpu);
-                        if (data) {
-                                *next = rec = g_malloc(sizeof(*rec));
-                                g_assert(rec != NULL);
-                                rec->offset = data->offset;
-                                rec->ts = data->ts;
-                                rec->next = NULL;
-                                next = &rec->next;
-                                free(data);
-                        }
+                        if (!data)
+                                break;
+
+                        *next = rec = g_malloc(sizeof(*rec));
+                        g_assert(rec != NULL);
+                        rec->offset = data->offset;
+                        rec->ts = data->ts;
+                        rec->next = NULL;
+                        next = &rec->next;
+                        free(data);
                         count++;
-                } while (data);
+                }
 
                 if (count) {
                         TraceViewRecord *trec;
diff --git a/trace-view.c b/trace-view.c
index 744f9a2..19e7317 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -25,6 +25,7 @@
 
 #include "trace-cmd.h"
 #include "trace-local.h"
+#include "trace-view-store.h"
 
 #define version "0.1.1"
 
@@ -169,24 +170,17 @@ delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
 }
 
 static GtkTreeModel *
-create_trace_view_model(void)
+create_trace_view_model(struct tracecmd_input *handle)
 {
-        GtkListStore *store;
+        TraceViewStore *store;
 
-        store = gtk_list_store_new(NUM_COLS,
-                                   G_TYPE_UINT,
-                                   G_TYPE_STRING,
-                                   G_TYPE_STRING,
-                                   G_TYPE_UINT,
-                                   G_TYPE_STRING,
-                                   G_TYPE_STRING,
-                                   G_TYPE_STRING);
+        store = trace_view_store_new(handle);
 
         return GTK_TREE_MODEL(store);
 }
 
 static GtkWidget *
-create_trace_view(void)
+create_trace_view(struct tracecmd_input *handle)
 {
         GtkTreeViewColumn *col;
         GtkCellRenderer *renderer;
@@ -250,7 +244,7 @@ create_trace_view(void)
                                              "text", COL_INFO,
                                              NULL);
 
-        model = create_trace_view_model();
+        model = create_trace_view_model(handle);
 
         gtk_tree_view_set_model(GTK_TREE_VIEW(view), model);
 
@@ -344,12 +338,12 @@ void trace_view(int argc, char **argv)
 
         /* --- Trace Tree --- */
 
-        trace_tree = create_trace_view();
+        trace_tree = create_trace_view(handle);
         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwin),
                                               trace_tree);
         gtk_widget_show(trace_tree);
 
-        trace_load_tree(handle, trace_tree);
+//      trace_load_tree(handle, trace_tree);
 
         /**********************************************
          *   Main Window