Add paging of large data files

Loading a large (100,000+ entry) data file can take a very long
time, and is quite annoying to wait for. This patch breaks the
data up into pages (10,000 rows per page). Then it lets the user
move about the pages with a scroll button.

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

5 files changed, 205 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index 8d4e48d..d01856a 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ all: $(TARGETS)
 
 LIB_FILE = libtracecmd.a
 
-HEADERS = parse-events.h trace-cmd.h trace-local.h
+HEADERS = parse-events.h trace-cmd.h trace-local.h trace-view-store.h
 
 trace-read.o::          $(HEADERS) 
 trace-cmd.o::           $(HEADERS) $(LIB_FILE)
diff --git a/trace-filter.c b/trace-filter.c
index 8d6fced..b7d8176 100644
--- a/trace-filter.c
+++ b/trace-filter.c
@@ -347,6 +347,7 @@ void trace_filter_cpu_dialog(void *trace_tree)
 
         cpu_helper->allcpus = allset;
         cpu_helper->cpu_mask = g_new0(guint64, (cpus >> 6) + 1);
+        g_assert(cpu_helper->cpu_mask != NULL);
 
         gtk_widget_show(check);
 
diff --git a/trace-view-store.c b/trace-view-store.c
index b65e6a3..3192b2b 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -177,6 +177,15 @@ trace_view_store_init (TraceViewStore *trace_view_store)
         trace_view_store->num_rows = 0;
         trace_view_store->rows  = NULL;
 
+        trace_view_store->spin = NULL;
+        trace_view_store->page = 1;
+        trace_view_store->pages = 1;
+        trace_view_store->rows_per_page = TRACE_VIEW_DEFAULT_MAX_ROWS;
+        trace_view_store->num_rows = 0;
+        trace_view_store->start_row = 0;
+        trace_view_store->visible_rows = 0;
+        trace_view_store->actual_rows = 0;
+
         /* Set all columns visible */
         trace_view_store->visible_column_mask = (1 << TRACE_VIEW_STORE_N_COLUMNS) - 1;
 
@@ -195,11 +204,14 @@ trace_view_store_init (TraceViewStore *trace_view_store)
 static void
 trace_view_store_finalize (GObject *object)
 {
-/*      TraceViewStore *trace_view_store = TRACE_VIEW_STORE(object); */
+        TraceViewStore *store = TRACE_VIEW_STORE(object);
 
         /* free all records and free all memory used by the list */
 #warning IMPLEMENT
 
+        if (store->spin)
+                g_object_unref(store->spin);
+
         /* must chain up - finalize parent */
         (* parent_class->finalize) (object);
 }
@@ -303,7 +315,7 @@ trace_view_store_get_iter (GtkTreeModel *tree_model,
 {
         TraceViewStore  *trace_view_store;
         TraceViewRecord *record;
-        gint    *indices, n, depth;
+        gint    *indices, n, depth, pos;
 
         g_assert(TRACE_VIEW_IS_LIST(tree_model));
         g_assert(path!=NULL);
@@ -321,10 +333,13 @@ trace_view_store_get_iter (GtkTreeModel *tree_model,
         if ( n >= trace_view_store->num_rows || n < 0 )
                 return FALSE;
 
-        record = trace_view_store->rows[n];
+        record = trace_view_store->rows[trace_view_store->start_row + n];
 
         g_assert(record != NULL);
-        g_assert(record->pos == n);
+
+        pos = record->pos - trace_view_store->start_row;
+
+        g_assert(pos == n);
 
         /* We simply store a pointer to our custom record in the iter */
         iter->stamp     = trace_view_store->stamp;
@@ -388,7 +403,7 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
         const gchar *comm;
         gchar *str;
         guint64 secs, usecs;
-        gint val;
+        gint val, pos;
         int cpu;
 
         g_return_if_fail (TRACE_VIEW_IS_LIST (tree_model));
@@ -405,7 +420,9 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
 
         g_return_if_fail ( record != NULL );
 
-        if(record->pos >= trace_view_store->num_rows)
+        pos = record->pos - trace_view_store->start_row;
+
+        if(pos >= trace_view_store->num_rows)
                 g_return_if_reached();
 
         column = get_visible_column(TRACE_VIEW_STORE(tree_model), column);
@@ -433,6 +450,7 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
         case TRACE_VIEW_STORE_COL_INFO:
 
                 data = tracecmd_read_at(trace_view_store->handle, record->offset, &cpu);
+                g_assert(data != NULL);
                 if (cpu != record->cpu) {
                         free(data);
                         return;
@@ -490,6 +508,7 @@ trace_view_store_iter_next (GtkTreeModel	*tree_model,
 {
         TraceViewRecord *record, *nextrecord;
         TraceViewStore  *trace_view_store;
+        gint pos;
 
         g_return_val_if_fail (TRACE_VIEW_IS_LIST (tree_model), FALSE);
 
@@ -500,8 +519,10 @@ trace_view_store_iter_next (GtkTreeModel	*tree_model,
 
         record = (TraceViewRecord *) iter->user_data;
 
+        pos = record->pos - trace_view_store->start_row;
+
         /* Is this the last record in the list? */
-        if ((record->pos + 1) >= trace_view_store->num_rows)
+        if ((pos + 1) >= trace_view_store->num_rows)
                 return FALSE;
 
         nextrecord = trace_view_store->rows[(record->pos + 1)];
@@ -638,10 +659,10 @@ trace_view_store_iter_nth_child (GtkTreeModel *tree_model,
         if( n >= trace_view_store->num_rows )
                 return FALSE;
 
-        record = trace_view_store->rows[n];
+        record = trace_view_store->rows[trace_view_store->start_row + n];
 
         g_assert( record != NULL );
-        g_assert( record->pos == n );
+        g_assert( record->pos - trace_view_store->start_row == n );
 
         iter->stamp = trace_view_store->stamp;
         iter->user_data = record;
@@ -702,6 +723,15 @@ static void mask_set_cpus(TraceViewStore *store, gint cpus)
         *(store->cpu_mask) = (1ULL << (cpus & ((1ULL << 6) - 1))) - 1;
 }
 
+static void update_page(TraceViewStore *store)
+{
+        if (!store->spin)
+                return;
+
+        gtk_spin_button_set_range(GTK_SPIN_BUTTON(store->spin),
+                                  1, store->pages);
+}
+
 /*****************************************************************************
  *
  *      merge_sort_rows_ts: Merge sort the data by time stamp.
@@ -752,7 +782,27 @@ static void merge_sort_rows_ts(TraceViewStore *store)
                 }
         } while (next >= 0);
 
-        store->num_rows = count;
+        store->visible_rows = count;
+        store->start_row = 0;
+        store->pages = (count / store->rows_per_page) + 1;
+
+        if (store->page > 1) {
+                if (count < store->page * store->rows_per_page)
+                        store->page = store->pages;
+
+                /* still greater? */
+                if (store->page > 1) {
+                        store->start_row =
+                                (store->page - 1) * store->rows_per_page;
+                        g_assert(store->start_row < count);
+                }
+        }
+
+        store->num_rows = count > (store->start_row + store->rows_per_page) ?
+                store->rows_per_page :
+                count - store->start_row;
+
+        update_page(store);
 
         g_free(indexes);
 }
@@ -826,6 +876,8 @@ trace_view_store_new (struct tracecmd_input *handle)
                         rec = list;
 
                         trec = g_new(TraceViewRecord, count);
+                        g_assert(trec != NULL);
+
                         for (i = 0; i < count; i++) {
                                 g_assert(rec != NULL);
                                 trec[i].cpu = cpu;
@@ -848,13 +900,29 @@ trace_view_store_new (struct tracecmd_input *handle)
                 total += count;
         }
 
-        newstore->rows = g_malloc(sizeof(*newstore->rows) * total);
+        newstore->actual_rows = total;
+        newstore->rows = g_malloc(sizeof(*newstore->rows) * total + 1);
 
         merge_sort_rows_ts(newstore);
 
         return newstore;
 }
 
+void trace_view_store_set_spin_button(TraceViewStore *store, GtkWidget *spin)
+{
+        g_return_if_fail (TRACE_VIEW_IS_LIST (store));
+        g_return_if_fail (GTK_IS_SPIN_BUTTON (spin));
+
+        store->spin = spin;
+
+        gtk_spin_button_set_increments(GTK_SPIN_BUTTON(store->spin),
+                                       1.0, 5.0);
+
+        update_page(store);
+
+        g_object_ref(spin);
+}
+
 /* --- helper functions --- */
 
 gboolean trace_view_store_cpu_isset(TraceViewStore *store, gint cpu)
@@ -907,6 +975,19 @@ void trace_view_store_clear_cpu(TraceViewStore *store, gint cpu)
         merge_sort_rows_ts(store);
 }
 
+void trace_view_store_set_page(TraceViewStore *store, gint page)
+{
+        g_return_if_fail (TRACE_VIEW_IS_LIST (store));
+        g_return_if_fail (page >= 0 || page < store->pages);
+
+        store->page = page;
+        store->start_row = (page - 1) * store->rows_per_page;
+        g_assert(store->start_row < store->visible_rows);
+        store->num_rows = store->start_row + store->rows_per_page <
+                store->visible_rows ? store->rows_per_page :
+                store->visible_rows - store->start_row;
+}
+
 
 /*****************************************************************************
  *
diff --git a/trace-view-store.h b/trace-view-store.h
index 8440888..9dbbb5a 100644
--- a/trace-view-store.h
+++ b/trace-view-store.h
@@ -62,7 +62,10 @@ struct _TraceViewStore
 {
         GObject                 parent; /* this MUST be the first member */
 
-        guint                   num_rows; /* number of rows that we have   */
+        guint                   start_row; /* row to start at */
+        guint                   num_rows; /* number of rows that we have showing   */
+        guint                   visible_rows; /* number of rows defined */
+        guint                   actual_rows; /* size of rows array */
         TraceViewRecord         **rows; /* a dynamically allocated array of pointers to
                                          *   the TraceViewRecord structure for each row    */
 
@@ -78,6 +81,11 @@ struct _TraceViewStore
         TraceViewRecord         **cpu_list;
         gint                    *cpu_items;
 
+        gint                    page;
+        gint                    pages;
+        gint                    rows_per_page;
+        GtkWidget               *spin;
+
         /* filters */
         gint                    all_events; /* set 1 when all events are enabled */
                                                 /* else */
@@ -91,29 +99,15 @@ struct _TraceViewStore
         gint            stamp;  /* Random integer to check whether an iter belongs to our model */
 };
 
-/* helper functions */
-
-static inline gint trace_view_store_get_cpus(TraceViewStore *store)
-{
-        return store->cpus;
-}
-
-static inline guint64 *trace_view_store_get_cpu_mask(TraceViewStore *store)
-{
-        return store->cpu_mask;
-}
-
-static inline gint trace_view_store_get_all_cpus(TraceViewStore *store)
-{
-        return store->all_cpus;
-}
-
 gboolean trace_view_store_cpu_isset(TraceViewStore *store, gint cpu);
 
 void trace_view_store_set_all_cpus(TraceViewStore *store);
 void trace_view_store_set_cpu(TraceViewStore *store, gint cpu);
 void trace_view_store_clear_cpu(TraceViewStore *store, gint cpu);
 
+void trace_view_store_set_spin_button(TraceViewStore *store, GtkWidget *spin);
+
+void trace_view_store_set_page(TraceViewStore *store, gint page);
 
 /* TraceViewStoreClass: more boilerplate GObject stuff */
 
@@ -127,10 +121,39 @@ GType		trace_view_store_get_type (void);
 
 TraceViewStore  *trace_view_store_new (struct tracecmd_input *handle);
 
+#define TRACE_VIEW_DEFAULT_MAX_ROWS 10000
+
 #if 0
 void            trace_view_store_append_record (TraceViewStore   *trace_view_store,
                                                 const gchar  *name,
                                                 guint         year_born);
 #endif
 
+
+/* helper functions */
+
+static inline gint trace_view_store_get_cpus(TraceViewStore *store)
+{
+        g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), -1);
+        return store->cpus;
+}
+
+static inline guint64 *trace_view_store_get_cpu_mask(TraceViewStore *store)
+{
+        g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), NULL);
+        return store->cpu_mask;
+}
+
+static inline gint trace_view_store_get_all_cpus(TraceViewStore *store)
+{
+        g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), -1);
+        return store->all_cpus;
+}
+
+static inline gint trace_view_store_get_page(TraceViewStore *store)
+{
+        g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), -1);
+        return store->page;
+}
+
 #endif /* _trace_view_store_h_included_ */
diff --git a/trace-view.c b/trace-view.c
index ac71c7c..555f1aa 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -80,6 +80,44 @@ cpus_clicked (gpointer data)
         trace_filter_cpu_dialog(trace_tree);
 }
 
+#if 0
+static GtkTreeModel *
+create_combo_box_model(void)
+{
+        GtkListStore *store;
+        GtkTreeIter iter;
+
+        store = gtk_list_store_new(1, G_TYPE_STRING);
+        gtk_list_store_append(store, &iter);
+        gtk_list_store_set(store, &iter, 0, "1", -1);
+
+        return GTK_TREE_MODEL(store);
+}
+#endif
+
+static void
+spin_changed(gpointer data, GtkWidget *spin)
+{
+        GtkTreeView *tree = data;
+        GtkTreeModel *model;
+        gint val, page;
+
+        val = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
+
+        model = gtk_tree_view_get_model(tree);
+        page = trace_view_store_get_page(TRACE_VIEW_STORE(model));
+        if (page == val)
+                return;
+
+        g_object_ref(model);
+        gtk_tree_view_set_model(tree, NULL);
+
+        trace_view_store_set_page(TRACE_VIEW_STORE(model), val);
+
+        gtk_tree_view_set_model(tree, model);
+        g_object_unref(model);
+}
+
 static GtkTreeModel *
 create_trace_view_model(struct tracecmd_input *handle)
 {
@@ -91,7 +129,8 @@ create_trace_view_model(struct tracecmd_input *handle)
 }
 
 static void
-load_trace_view(GtkWidget *view, struct tracecmd_input *handle)
+load_trace_view(GtkWidget *view, struct tracecmd_input *handle,
+                GtkWidget *spin)
 {
         GtkTreeViewColumn *col;
         GtkCellRenderer *renderer;
@@ -155,6 +194,9 @@ load_trace_view(GtkWidget *view, struct tracecmd_input *handle)
 
         model = create_trace_view_model(handle);
 
+        trace_view_store_set_spin_button(TRACE_VIEW_STORE(model), spin);
+        g_object_unref(spin);
+
         gtk_tree_view_set_model(GTK_TREE_VIEW(view), model);
 
         g_object_unref(model); /* destroy model automatically with view */
@@ -171,6 +213,8 @@ void trace_view(int argc, char **argv)
         GtkWidget *menu_item;
         GtkWidget *sub_item;
         GtkWidget *scrollwin;
+        GtkWidget *label;
+        GtkWidget *spin;
 
         handle = read_trace_header();
         if (!handle)
@@ -279,6 +323,29 @@ void trace_view(int argc, char **argv)
         /* --- End Filter Options --- */
         gtk_menu_item_set_submenu(GTK_MENU_ITEM (menu_item), menu);
 
+
+        /* --- Paging Hbox --- */
+
+        hbox = gtk_hbox_new(FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+        gtk_widget_show(hbox);
+
+        /* --- Page Spin Button --- */
+
+        label = gtk_label_new("Page");
+        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+        gtk_widget_show(label);
+
+        spin = gtk_spin_button_new(NULL, 1.0, 0);
+        gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), 1, 1);
+        gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
+        gtk_widget_show(spin);
+
+        g_signal_connect_swapped (G_OBJECT (spin), "value-changed",
+                                  G_CALLBACK (spin_changed),
+                                  (gpointer) trace_tree);
+
+
         /* --- Top Level Hbox --- */
 
         hbox = gtk_hbox_new(FALSE, 0);
@@ -295,7 +362,8 @@ void trace_view(int argc, char **argv)
 
         /* --- Set up Trace Tree --- */
 
-        load_trace_view(trace_tree, handle);
+        load_trace_view(trace_tree, handle, spin);
+
         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwin),
                                               trace_tree);
         gtk_widget_show(trace_tree);