trace-view: Add search feature

Add a search feature to search for matches in the list rows.

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

4 files changed, 319 insertions, 13 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 720833b..b0d2a19 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -718,6 +718,18 @@ void kernel_shark(int argc, char **argv)
         gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
         gtk_widget_show(spin);
 
+        /* --- Search --- */
+
+        /* The tree needs its columns loaded now */
+        info->treeview = gtk_tree_view_new();
+        trace_view_load(info->treeview, handle, spin);
+
+        label = gtk_label_new("      Search: ");
+        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+        gtk_widget_show(label);
+
+        trace_view_search_setup(GTK_BOX(hbox), GTK_TREE_VIEW(info->treeview));
+
         /* --- Top Level Trace View Paging Hbox --- */
 
         hbox = gtk_hbox_new(FALSE, 0);
@@ -734,13 +746,9 @@ void kernel_shark(int argc, char **argv)
 
         /* --- Set up Trace Tree --- */
 
-        info->treeview = gtk_tree_view_new();
-
         g_signal_connect(info->treeview, "row-activated",
                          (GCallback)row_double_clicked, info);
 
-        trace_view_load(info->treeview, handle, spin);
-
         gtk_container_add(GTK_CONTAINER(scrollwin), info->treeview);
 
         gtk_signal_connect(GTK_OBJECT(info->treeview), "button_press_event",
diff --git a/trace-view-main.c b/trace-view-main.c
index 122cda8..c728646 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -257,6 +257,17 @@ void trace_view(int argc, char **argv)
         gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
         gtk_widget_show(spin);
 
+        /* --- Search --- */
+
+        /* The tree needs its columns loaded now */
+        trace_view_load(trace_tree, handle, spin);
+
+        label = gtk_label_new("      Search: ");
+        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+        gtk_widget_show(label);
+
+        trace_view_search_setup(GTK_BOX(hbox), GTK_TREE_VIEW(trace_tree));
+
         /* --- Top Level Hbox --- */
 
         hbox = gtk_hbox_new(FALSE, 0);
@@ -273,8 +284,6 @@ void trace_view(int argc, char **argv)
 
         /* --- Set up Trace Tree --- */
 
-        trace_view_load(trace_tree, handle, spin);
-
         gtk_container_add(GTK_CONTAINER(scrollwin), trace_tree);
         gtk_widget_show(trace_tree);
 
diff --git a/trace-view.c b/trace-view.c
index 8b98e48..90c01c7 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -18,6 +18,7 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -306,10 +307,20 @@ void trace_view_update_filters(GtkWidget *treeview,
                 trace_view_select(treeview, time);
 }
 
+static void select_row_from_path(GtkTreeView *tree, GtkTreePath *path)
+{
+        GtkTreeSelection *selection;
+
+        selection = gtk_tree_view_get_selection(tree);
+        gtk_tree_selection_select_path(selection, path);
+
+        /* finally, make it visible */
+        gtk_tree_view_scroll_to_cell(tree, path, NULL, TRUE, 0.5, 0.0);
+}
+
 void trace_view_select(GtkWidget *treeview, guint64 time)
 {
         GtkTreeView *tree = GTK_TREE_VIEW(treeview);
-        GtkTreeSelection *selection;
         GtkTreeModel *model;
         GtkTreePath *path;
         gint select_page, page;
@@ -351,12 +362,7 @@ void trace_view_select(GtkWidget *treeview, guint64 time)
         snprintf(buf, 100, "%d", row);
         printf("row = %s\n", buf);
         path = gtk_tree_path_new_from_string(buf);
-
-        selection = gtk_tree_view_get_selection(tree);
-        gtk_tree_selection_select_path(selection, path);
-
-        /* finally, make it visible */
-        gtk_tree_view_scroll_to_cell(tree, path, NULL, TRUE, 0.5, 0.0);
+        select_row_from_path(tree, path);
         gtk_tree_path_free(path);
 }
 
@@ -461,3 +467,284 @@ void trace_view_cpu_filter_callback(gboolean accept,
         gtk_tree_view_set_model(trace_tree, GTK_TREE_MODEL(store));
         g_object_unref(store);
 }
+
+static GtkTreeModel *create_col_model(GtkTreeView *treeview)
+{
+        GtkListStore *store;
+        GtkTreeViewColumn *col;
+        GtkTreeIter iter;
+        const gchar *title;
+        int i;
+
+        store = gtk_list_store_new(1, G_TYPE_STRING);
+
+        i = 0;
+        col = gtk_tree_view_get_column(treeview, i++);
+        while (col) {
+                title = gtk_tree_view_column_get_title(col);
+                if (!title)
+                        break;
+
+                gtk_list_store_append(store, &iter);
+                gtk_list_store_set(store, &iter,
+                                   0, title,
+                                   -1);
+
+                col = gtk_tree_view_get_column(treeview, i++);
+        }
+
+        return GTK_TREE_MODEL(store);
+}
+
+struct search_info {
+        GtkTreeView             *treeview;
+        GtkWidget               *entry;
+        GtkWidget               *selection;
+        GtkWidget               *column;
+};
+
+#define SELECTION_NAMES                                 \
+        C(      contains,       CONTAINS        ),      \
+        C(      full match,     FULL_MATCH      ),      \
+        C(      does not have,  NOT_IN          )
+
+#undef C
+#define C(a, b) #a
+
+static gchar *select_names[] = { SELECTION_NAMES, NULL };
+
+#undef C
+#define C(a, b) SEL_##b
+
+enum select_options { SELECTION_NAMES };
+
+static gboolean test_int(gint val, gint search_val, enum select_options sel)
+{
+        gint tens;
+        gboolean match = TRUE;
+
+        switch (sel) {
+        case SEL_NOT_IN:
+                match = FALSE;
+        case SEL_CONTAINS:
+                for (tens = 1; search_val / tens; tens *= 10)
+                        ;
+
+                while (val) {
+                        if (val - search_val == (val / tens) * tens)
+                                return match;
+                        val /= 10;
+                }
+                return !match;
+
+        case SEL_FULL_MATCH:
+                return search_val == val;
+        }
+        return FALSE;
+}
+
+static gboolean test_text(const gchar *text, const gchar *search_text, enum select_options sel)
+{
+        gboolean match = TRUE;
+
+        switch (sel) {
+        case SEL_NOT_IN:
+                match = FALSE;
+        case SEL_CONTAINS:
+
+                text = strcasestr(text, search_text);
+                if (text)
+                        return match;
+                return !match;
+
+        case SEL_FULL_MATCH:
+                return strcmp(text, search_text) == 0;
+        }
+        return FALSE;
+}
+
+static void search_tree(gpointer dat