3 files changed, 75 insertions, 0 deletions

diff --git a/trace-graph-main.c b/trace-graph-main.c
index e6fca6b..987a80d 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -110,6 +110,16 @@ events_clicked (gpointer data)
                                          trace_graph_event_filter_callback, ginfo);
 }
 
+/* Callback for the clicked signal of the Advanced filter button */
+static void
+adv_filter_clicked (gpointer data)
+{
+        struct graph_info *ginfo = data;
+
+        trace_adv_filter_dialog(ginfo->handle, ginfo->event_filter,
+                                trace_graph_adv_filter_callback, ginfo);
+}
+
 void trace_graph(int argc, char **argv)
 {
         struct tracecmd_input *handle = NULL;
@@ -246,6 +256,22 @@ void trace_graph(int argc, char **argv)
         gtk_widget_show(sub_item);
 
 
+        /* --- Filter - Advanced Events Option --- */
+
+        sub_item = gtk_menu_item_new_with_label("advanced event filter");
+
+        /* Add them to the menu */
+        gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
+
+        /* We can attach the Quit menu item to our exit function */
+        g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
+                                  G_CALLBACK (adv_filter_clicked),
+                                  (gpointer) ginfo);
+
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
+
+
         /* --- End Filter Options --- */
         gtk_menu_item_set_submenu(GTK_MENU_ITEM (menu_item), menu);
 
diff --git a/trace-graph.c b/trace-graph.c
index 8283824..e83bf27 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -32,6 +32,8 @@
 #include "trace-hash.h"
 #include "trace-filter.h"
 
+#include "util.h"
+
 #define DEBUG_LEVEL     0
 #if DEBUG_LEVEL > 0
 # define dprintf(l, x...)                       \
@@ -1752,6 +1754,48 @@ void trace_graph_event_filter_callback(gboolean accept,
         redraw_graph(ginfo);
 }
 
+void trace_graph_adv_filter_callback(gboolean accept,
+                                     const gchar *text,
+                                     gint *event_ids,
+                                     gpointer data)
+{
+        struct graph_info *ginfo = data;
+        struct event_filter *event_filter;
+        char *error_str;
+        int ret;
+        int i;
+
+        if (!accept)
+                return;
+
+        if (!has_text(text) && !event_ids)
+                return;
+
+        event_filter = ginfo->event_filter;
+
+        if (event_ids) {
+                for (i = 0; event_ids[i] >= 0; i++)
+                        pevent_filter_remove_event(event_filter, event_ids[i]);
+        }
+
+        if (has_text(text)) {
+
+                ginfo->all_events = FALSE;
+
+                pevent_filter_clear_trivial(event_filter,
+                                            FILTER_TRIVIAL_BOTH);
+
+                ret = pevent_filter_add_filter_str(event_filter, text, &error_str);
+                if (ret < 0) {
+                        warning("filter failed due to: %s", error_str);
+                        free(error_str);
+                        return;
+                }
+        }
+
+        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 411e750..3130e98 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -231,6 +231,11 @@ void trace_graph_event_filter_callback(gboolean accept,
                                        gint *events,
                                        gpointer data);
 
+void trace_graph_adv_filter_callback(gboolean accept,
+                                     const gchar *text,
+                                     gint *event_ids,
+                                     gpointer data);
+
 static inline GtkWidget *trace_graph_get_draw(struct graph_info *ginfo)
 {
         return ginfo->draw;