kernelshark: Make sync filters between graph and list handle advance

Make sure the advanced filters get copied too when syncing between
the graph and list filters.

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

5 files changed, 88 insertions, 53 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 1f679ad..aa408d2 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -271,8 +271,6 @@ sync_graph_events_to_list_clicked (gpointer data)
         GtkTreeModel *model;
         TraceViewStore *store;
         gboolean all_events;
-        gchar **systems;
-        gint *events;
 
         model = gtk_tree_view_get_model(trace_tree);
         if (!model)
@@ -283,13 +281,8 @@ sync_graph_events_to_list_clicked (gpointer data)
         all_events = trace_view_store_get_all_events_enabled(store);
         event_filter = trace_view_store_get_event_filter(store);
 
-        trace_filter_convert_filter_to_names(event_filter,
-                                             &systems, &events);
-
-        trace_graph_event_filter_callback(TRUE, all_events, systems,
-                                          events, info->ginfo);
-        free(systems);
-        free(events);
+        trace_graph_copy_filter(info->ginfo, all_events,
+                                event_filter);
 }
 
 
@@ -299,17 +292,11 @@ sync_list_events_to_graph_clicked (gpointer data)
         struct shark_info *info = data;
         struct graph_info *ginfo = info->ginfo;
         gboolean all_events;
-        gchar **systems;
-        gint *events;
 
         all_events = ginfo->all_events;
-        trace_filter_convert_filter_to_names(ginfo->event_filter,
-                                             &systems, &events);
 
-        trace_view_event_filter_callback(TRUE, all_events, systems,
-                                         events, info->treeview);
-        free(systems);
-        free(events);
+        trace_view_copy_filter(info->treeview, all_events,
+                               ginfo->event_filter);
 }
 
 /* Callback for the clicked signal of the CPUs filter button */
diff --git a/trace-graph.c b/trace-graph.c
index e83bf27..fa76874 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1796,6 +1796,25 @@ void trace_graph_adv_filter_callback(gboolean accept,
         redraw_graph(ginfo);
 }
 
+void trace_graph_copy_filter(struct graph_info *ginfo,
+                             gboolean all_events,
+                             struct event_filter *event_filter)
+{
+        if (all_events) {
+                ginfo->all_events = TRUE;
+                /* filter is no longer used */
+                pevent_filter_reset(ginfo->event_filter);
+                redraw_graph(ginfo);
+                return;
+        }
+
+        ginfo->all_events = FALSE;
+
+        pevent_filter_copy(ginfo->event_filter, event_filter);
+
+        redraw_graph(ginfo);
+}
+
 static void redraw_pixmap_backend(struct graph_info *ginfo)
 {
         GdkPixmap *old_pix;
diff --git a/trace-graph.h b/trace-graph.h
index 3130e98..ae5f50d 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -274,6 +274,10 @@ int trace_graph_check_sched_wakeup(struct graph_info *ginfo,
 gboolean trace_graph_filter_on_task(struct graph_info *ginfo, gint pid);
 gboolean trace_graph_filter_on_event(struct graph_info *ginfo, struct record *record);
 
+void trace_graph_copy_filter(struct graph_info *ginfo,
+                             gboolean all_events,
+                             struct event_filter *event_filter);
+
 /* plots */
 void trace_graph_plot_free(struct graph_info *ginfo);
 void trace_graph_plot_init(struct graph_info *ginfo);
diff --git a/trace-view.c b/trace-view.c
index bcba484..140bfcd 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -379,6 +379,30 @@ void trace_view_select(GtkWidget *treeview, guint64 time)
         gtk_tree_path_free(path);
 }
 
+static void update_rows(GtkTreeView *trace_tree, TraceViewStore *store)
+{
+        TraceViewRecord *vrec;
+        guint64 time;
+        gint row;
+
+        /* Keep track of the currently selected row */
+        row = trace_view_get_selected_row(GTK_WIDGET(trace_tree));
+        if (row >= 0) {
+                vrec = trace_view_store_get_row(store, row);
+                time = vrec->timestamp;
+        }
+
+        /* Force an update */
+        g_object_ref(store);
+        gtk_tree_view_set_model(trace_tree, NULL);
+        trace_view_store_update_filter(store);
+        gtk_tree_view_set_model(trace_tree, GTK_TREE_MODEL(store));
+        g_object_unref(store);
+
+        if (row >= 0)
+                trace_view_select(GTK_WIDGET(trace_tree), time);
+}
+
 void trace_view_event_filter_callback(gboolean accept,
                                       gboolean all_events,
                                       gchar **systems,
@@ -389,9 +413,6 @@ void trace_view_event_filter_callback(gboolean accept,
         GtkTreeView *trace_tree = data;
         GtkTreeModel *model;
         TraceViewStore *store;
-        TraceViewRecord *vrec;
-        guint64 time;
-        gint row;
 
         if (!accept)
                 return;
@@ -415,22 +436,7 @@ void trace_view_event_filter_callback(gboolean accept,
                 trace_filter_convert_char_to_filter(event_filter, systems, events);
         }
 
-        /* Keep track of the currently selected row */
-        row = trace_view_get_selected_row(GTK_WIDGET(trace_tree));
-        if (row >= 0) {
-                vrec = trace_view_store_get_row(store, row);
-                time = vrec->timestamp;
-        }
-
-        /* Force an update */
-        g_object_ref(store);
-        gtk_tree_view_set_model(trace_tree, NULL);
-        trace_view_store_update_filter(store);
-        gtk_tree_view_set_model(trace_tree, GTK_TREE_MODEL(store));
-        g_object_unref(store);
-
-        if (row >= 0)
-                trace_view_select(GTK_WIDGET(trace_tree), time);
+        update_rows(trace_tree, store);
 }
 
 void trace_view_adv_filter_callback(gboolean accept,
@@ -442,10 +448,7 @@ void trace_view_adv_filter_callback(gboolean accept,
         GtkTreeView *trace_tree = data;
         GtkTreeModel *model;
         TraceViewStore *store;
-        TraceViewRecord *vrec;
         char *error_str;
-        guint64 time;
-        gint row;
         int ret;
         int i;
 
@@ -480,22 +483,40 @@ void trace_view_adv_filter_callback(gboolean accept,
                 }
         }
 
-        /* Keep track of the currently selected row */
-        row = trace_view_get_selected_row(GTK_WIDGET(trace_tree));
-        if (row >= 0) {
-                vrec = trace_view_store_get_row(store, row);
-                time = vrec->timestamp;
-        }
+        update_rows(trace_tree, store);
+}
 
-        /* Force an update */
-        g_object_ref(store);
-        gtk_tree_view_set_model(trace_tree, NULL);
-        trace_view_store_update_filter(store);
-        gtk_tree_view_set_model(trace_tree, GTK_TREE_MODEL(store));
-        g_object_unref(store);
+void trace_view_copy_filter(GtkWidget *treeview,
+                            gboolean all_events,
+                            struct event_filter *src_event_filter)
+{
+        GtkTreeView *trace_tree;
+        struct event_filter *event_filter;
+        GtkTreeModel *model;
+        TraceViewStore *store;
 
-        if (row >= 0)
-                trace_view_select(GTK_WIDGET(trace_tree), time);
+        trace_tree = GTK_TREE_VIEW(treeview);
+
+        model = gtk_tree_view_get_model(trace_tree);
+        if (!model)
+                return;
+
+        store = TRACE_VIEW_STORE(model);
+
+        if (all_events) {
+                if (trace_view_store_get_all_events_enabled(store))
+                        return;
+
+                trace_view_store_set_all_events_enabled(store);
+        } else {
+                trace_view_store_clear_all_events_enabled(store);
+
+                event_filter = trace_view_store_get_event_filter(store);
+
+                pevent_filter_copy(event_filter, src_event_filter);
+        }
+
+        update_rows(trace_tree, store);
 }
 
 void trace_view_cpu_filter_callback(gboolean accept,
diff --git a/trace-view.h b/trace-view.h
index bbc05ce..182b285 100644
--- a/trace-view.h
+++ b/trace-view.h
@@ -57,6 +57,10 @@ void trace_view_cpu_filter_callback(gboolean accept,
                                     guint64 *selected_cpu_mask,
                                     gpointer data);
 
+void trace_view_copy_filter(GtkWidget *treeview,
+                            gboolean all_events,
+                            struct event_filter *event_filter);
+
 void trace_view_search_setup(GtkBox *box, GtkTreeView *treeview);
 
 gint trace_view_get_selected_row(GtkWidget *treeview);