kernelshark/trace-graph: Convert to use trace_filter_event_filter_dialog()

Use the event_filter dialog instead of the system and event names.
trace-view already does this, this patch converts kernelshark and
trace-graph.

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

3 files changed, 16 insertions, 29 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index fc90443..92eea8e 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -197,8 +197,6 @@ list_events_clicked (gpointer data)
         GtkTreeModel *model;
         TraceViewStore *store;
         gboolean all_events;
-        gchar **systems;
-        gint *events;
 
         model = gtk_tree_view_get_model(trace_tree);
         if (!model)
@@ -209,14 +207,10 @@ list_events_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_filter_event_dialog(store->handle, all_events,
-                                  systems, events,
-                                  trace_view_event_filter_callback, info->treeview);
-        free(systems);
-        free(events);
+        trace_filter_event_filter_dialog(store->handle, event_filter,
+                                         all_events,
+                                         trace_view_event_filter_callback,
+                                         info->treeview);
 }
 
 static void
@@ -225,17 +219,14 @@ graph_events_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_filter_event_dialog(info->handle, all_events,
-                                  systems, events,
-                                  trace_graph_event_filter_callback, ginfo);
-        free(systems);
-        free(events);
+
+        trace_filter_event_filter_dialog(info->handle,
+                                         ginfo->event_filter,
+                                         all_events,
+                                         trace_graph_event_filter_callback,
+                                         ginfo);
 }
 
 static void
diff --git a/trace-graph-main.c b/trace-graph-main.c
index b31e118..e6fca6b 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -99,21 +99,15 @@ events_clicked (gpointer data)
 {
         struct graph_info *ginfo = data;
         gboolean all_events = TRUE;
-        gchar **systems = NULL;
-        gint *events = NULL;
 
         if (!ginfo->handle)
                 return;
 
         all_events = ginfo->all_events;
 
-        trace_filter_convert_filter_to_names(ginfo->event_filter,
-                                             &systems, &events);
-        trace_filter_event_dialog(ginfo->handle, all_events,
-                                  systems, events,
-                                  trace_graph_event_filter_callback, ginfo);
-        free(systems);
-        free(events);
+        trace_filter_event_filter_dialog(ginfo->handle, ginfo->event_filter,
+                                         all_events,
+                                         trace_graph_event_filter_callback, ginfo);
 }
 
 void trace_graph(int argc, char **argv)
diff --git a/trace-graph.c b/trace-graph.c
index a440602..8283824 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -1736,13 +1736,15 @@ void trace_graph_event_filter_callback(gboolean accept,
 
         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_reset(ginfo->event_filter);
+        pevent_filter_clear_trivial(ginfo->event_filter, FILTER_TRIVIAL_BOTH);
 
         trace_filter_convert_char_to_filter(ginfo->event_filter,
                                             systems, events);