trace-view: Make advanced filters show differently in event filter dialog

Have the events with event filters show up greyed out in the event
filter dialog. If the user keeps them active, the filter stays active.
But if the user disables the filter, then it will go away.

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

4 files changed, 108 insertions, 35 deletions

diff --git a/trace-filter.c b/trace-filter.c
index 38ca58c..51e0add 100644
--- a/trace-filter.c
+++ b/trace-filter.c
@@ -273,6 +273,7 @@ create_adv_filter_view(struct tracecmd_input *handle,
 
         gtk_tree_view_column_add_attribute(col, renderer, "text", ADV_COL_EVENT);
 
+
         /* --- filter column --- */
 
         col = gtk_tree_view_column_new();
@@ -384,6 +385,7 @@ void trace_adv_filter_dialog(struct tracecmd_input *handle,
 enum {
         COL_EVENT,
         COL_ACTIVE,
+        COL_NORMAL,
         COL_ACTIVE_START,
         COL_EVENT_ID,
         NUM_EVENT_COLS,
@@ -421,8 +423,9 @@ gboolean event_is_enabled(gint *events, gint events_size, gint event)
 
 static GtkTreeModel *
 create_tree_event_model(struct tracecmd_input *handle,
-                       gboolean all_events, gchar **systems_set,
-                       gint *event_ids_set)
+                        struct event_filter *filter,
+                        gboolean all_events, gchar **systems_set,
+                        gint *event_ids_set)
 {
         GtkTreeStore *treestore;
         GtkTreeIter iter_all, iter_sys, iter_events;
@@ -431,7 +434,7 @@ create_tree_event_model(struct tracecmd_input *handle,
         struct event_format *event;
         char *last_system = NULL;
         gboolean sysactive;
-        gboolean active;
+        gboolean active, normal;
         gchar **systems = NULL;
         gint *event_ids = NULL;
         gint systems_size;
@@ -442,12 +445,13 @@ create_tree_event_model(struct tracecmd_input *handle,
 
         treestore = gtk_tree_store_new(NUM_EVENT_COLS, G_TYPE_STRING,
                                        G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
-                                       G_TYPE_INT);
+                                       G_TYPE_BOOLEAN, G_TYPE_INT);
 
         gtk_tree_store_append(treestore, &iter_all, NULL);
         gtk_tree_store_set(treestore, &iter_all,
                            COL_EVENT,   "All",
                            COL_ACTIVE, all_events,
+                           COL_NORMAL, TRUE,
                            COL_ACTIVE_START, FALSE,
                            -1);
 
@@ -480,19 +484,31 @@ create_tree_event_model(struct tracecmd_input *handle,
                         gtk_tree_store_set(treestore, &iter_sys,
                                            COL_EVENT, event->system,
                                            COL_ACTIVE, sysactive,
+                                           COL_NORMAL, TRUE,
                                            -1);
                         last_system = event->system;
                 }
 
                 active = all_events || sysactive ||
                         event_is_enabled(event_ids, event_ids_size, event->id);
+
+                normal = TRUE;
+                if (active && filter) {
+                        if (!pevent_filter_event_has_trivial(filter, event->id,
+                                                             FILTER_TRIVIAL_BOTH))
+                                normal = FALSE;
+                        /* Make trivial false not selected */
+                        else if (pevent_filter_event_has_trivial(filter, event->id,
+                                                                 FILTER_TRIVIAL_FALSE))
+                                active = FALSE;
+                }
                 gtk_tree_store_append(treestore, &iter_events, &iter_sys);
                 gtk_tree_store_set(treestore, &iter_events,
                                    COL_EVENT, event->name,
                                    COL_ACTIVE, active,
+                                   COL_NORMAL, normal,
                                    COL_EVENT_ID, event->id,
                                    -1);
-
         }
 
         g_free(systems);
@@ -694,6 +710,7 @@ static void expand_rows(GtkTreeView *tree, GtkTreeModel *model,
 
 static GtkWidget *
 create_event_list_view(struct tracecmd_input *handle,
+                       struct event_filter *filter,
                        gboolean all_events, gchar **systems,
                        gint *events)
 {
@@ -720,10 +737,12 @@ create_event_list_view(struct tracecmd_input *handle,
         gtk_tree_view_column_pack_start(col, togrend, FALSE);
         gtk_tree_view_column_pack_start(col, renderer, FALSE);
         gtk_tree_view_column_add_attribute(col, togrend, "active", COL_ACTIVE);
+        gtk_tree_view_column_add_attribute(col, togrend, "sensitive", COL_NORMAL);
 
         gtk_tree_view_column_add_attribute(col, renderer, "text", COL_EVENT);
+        gtk_tree_view_column_add_attribute(col, renderer, "sensitive", COL_NORMAL);
 
-        model = create_tree_event_model(handle, all_events, systems, events);
+        model = create_tree_event_model(handle, filter, all_events, systems, events);
 
         gtk_tree_view_set_model(GTK_TREE_VIEW(view), model);
 
@@ -901,22 +920,12 @@ event_dialog_response (gpointer data, gint response_id)
         g_free(helper);
 }
 
-/**
- * trace_filter_event_dialog - make dialog with event listing
- * @handle: the handle to the tracecmd data file
- * @all_events: if TRUE then select all events.
- * @systems: NULL or a string array of systems terminated with NULL
- * @events: NULL or a int array of event ids terminated with -1
- * @func: The function to call when accept or cancel is pressed
- * @data: data to pass to the function @func
- *
- * If @all_events is set, then @systems and @events are ignored.
- */
-void trace_filter_event_dialog(struct tracecmd_input *handle,
-                               gboolean all_events,
-                               gchar **systems, gint *events,
-                               trace_filter_event_cb_func func,
-                               gpointer data)
+static void filter_event_dialog(struct tracecmd_input *handle,
+                                struct event_filter *filter,
+                                gboolean all_events,
+                                gchar **systems, gint *events,
+                                trace_filter_event_cb_func func,
+                                gpointer data)
 {
         struct dialog_helper *helper;
         struct event_filter_helper *event_helper;
@@ -955,7 +964,7 @@ void trace_filter_event_dialog(struct tracecmd_input *handle,
         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
-        view = create_event_list_view(handle, all_events, systems, events);
+        view = create_event_list_view(handle, filter, all_events, systems, events);
         event_helper->view = GTK_TREE_VIEW(view);
 
         gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), scrollwin, TRUE, TRUE, 0);
@@ -967,6 +976,52 @@ void trace_filter_event_dialog(struct tracecmd_input *handle,
         gtk_widget_show_all(dialog);
 }
 
+/**
+ * trace_filter_event_dialog - make dialog with event listing
+ * @handle: the handle to the tracecmd data file
+ * @all_events: if TRUE then select all events.
+ * @systems: NULL or a string array of systems terminated with NULL
+ * @events: NULL or a int array of event ids terminated with -1
+ * @func: The function to call when accept or cancel is pressed
+ * @data: data to pass to the function @func
+ *
+ * If @all_events is set, then @systems and @events are ignored.
+ */
+void trace_filter_event_dialog(struct tracecmd_input *handle,
+                               gboolean all_events,
+                               gchar **systems, gint *events,
+                               trace_filter_event_cb_func func,
+                               gpointer data)
+{
+        filter_event_dialog(handle, NULL, all_events, systems,
+                            events, func, data);
+}
+
+/**
+ * trace_filter_event_filter_dialog - make dialog with event listing
+ * @handle: the handle to the tracecmd data file
+ * @filter: the event filter to determine what to display.
+ * @all_events: if TRUE then select all events.
+ * @func: The function to call when accept or cancel is pressed
+ * @data: data to pass to the function @func
+ *
+ * If @all_events is set, then @systems and @events are ignored.
+ */
+void trace_filter_event_filter_dialog(struct tracecmd_input *handle,
+                                      struct event_filter *filter,
+                                      gboolean all_events,
+                                      trace_filter_event_cb_func func,
+                                      gpointer data)
+{
+        gchar **systems;
+        gint *event_ids;
+
+        trace_filter_convert_filter_to_names(filter, &systems, &event_ids);
+
+        filter_event_dialog(handle, filter, all_events, systems,
+                            event_ids, func, data);
+}
+
 struct cpu_filter_helper {
         gboolean                        allcpus;
         guint64                         *cpu_mask;
@@ -1285,7 +1340,8 @@ void trace_filter_convert_filter_to_names(struct event_filter *filter,
                         all_selected = 1;
                 }
 
-                if (pevent_event_filtered(filter, event->id)) {
+                if (pevent_filter_event_has_trivial(filter, event->id,
+                                                    FILTER_TRIVIAL_TRUE)) {
                         if (!all_selected || !systems)
                                 add_event_int(event_ids, event->id, event_count++);
                 } else {
@@ -1296,6 +1352,10 @@ void trace_filter_convert_filter_to_names(struct event_filter *filter,
                                 }
                         }
                         all_selected = 0;
+
+                        /* If this event is filtered, still add it */
+                        if (pevent_event_filtered(filter, event->id))
+                                add_event_int(event_ids, event->id, event_count++);
                 }
                 last_system = event->system;
         }
@@ -1314,9 +1374,18 @@ void trace_filter_convert_char_to_filter(struct event_filter *filter,
                                          gchar **systems,
                                          gint *events)
 {
+        struct pevent *pevent;
+        struct event_filter *copy;
         struct event_format *event;
         int i;
 
+        pevent = filter->pevent;
+
+        /* Make a copy to use later */
+        copy = pevent_filter_alloc(pevent);
+        pevent_filter_copy(copy, filter);
+        pevent_filter_reset(filter);
+
         if (systems) {
                 for (i = 0; systems[i]; i++)
                         pevent_filter_add_filter_str(filter,
@@ -1332,4 +1401,8 @@ void trace_filter_convert_char_to_filter(struct event_filter *filter,
                                                              NULL);
                 }
         }
+
+        pevent_update_trivial(filter, copy, FILTER_TRIVIAL_BOTH);
+
+        pevent_filter_free(copy);
 }
diff --git a/trace-filter.h b/trace-filter.h
index f4ee26d..64d7b47 100644
--- a/trace-filter.h
+++ b/trace-filter.h
@@ -77,6 +77,12 @@ void trace_filter_event_dialog(struct tracecmd_input *handle,
                                trace_filter_event_cb_func func,
                                gpointer data);
 
+void trace_filter_event_filter_dialog(struct tracecmd_input *handle,
+                               struct event_filter *filter,
+                               gboolean all_events,
+                               trace_filter_event_cb_func func,
+                               gpointer data);
+
 void trace_filter_convert_filter_to_names(struct event_filter *filter,
                                           gchar ***systems,
                                           gint **events);
diff --git a/trace-view-main.c b/trace-view-main.c
index 268726c..d298e68 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -104,8 +104,6 @@ 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)
@@ -116,14 +114,10 @@ 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, trace_tree);
-        free(systems);
-        free(events);
+        trace_filter_event_filter_dialog(store->handle, event_filter,
+                                         all_events,
+                                         trace_view_event_filter_callback,
+                                         trace_tree);
 }
 
 /* Callback for the clicked signal of the Advanced filter button */
diff --git a/trace-view-store.c b/trace-view-store.c
index f2a03fc..ba40aad 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -525,7 +525,7 @@ void trace_view_store_clear_all_events_enabled(TraceViewStore *store)
 {
         g_return_if_fail (TRACE_VIEW_IS_LIST (store));
 
-        pevent_filter_clear_trivial(store->event_filter, FILTER_TRIVIAL_TRUE);
+        pevent_filter_clear_trivial(store->event_filter, FILTER_TRIVIAL_BOTH);
         store->all_events = 0;
 }