trace-view: Add hiding of tasks to list

Pass the task filters for both hiding and filtering from the
graph to the list.

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

6 files changed, 140 insertions, 28 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 4eb0c7e..ddeee9f 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -217,10 +217,11 @@ filter_list_enable_clicked (gpointer data)
         info->list_filter_enabled ^= 1;
 
         if (info->list_filter_enabled)
-                trace_view_update_task_filter(info->treeview,
-                                              info->ginfo->task_filter);
+                trace_view_update_filters(info->treeview,
+                                          info->ginfo->task_filter,
+                                          info->ginfo->hide_tasks);
         else
-                trace_view_update_task_filter(info->treeview, NULL);
+                trace_view_update_filters(info->treeview, NULL, NULL);
 }
 
 static void
@@ -231,11 +232,9 @@ filter_add_task_clicked (gpointer data)
         trace_graph_filter_add_remove_task(info->ginfo, info->selected_task);
 
         if (info->list_filter_enabled) {
-                if (filter_task_count(info->ginfo->task_filter))
-                        trace_view_update_task_filter(info->treeview,
-                                                      info->ginfo->task_filter);
-                else
-                        trace_view_update_task_filter(info->treeview, NULL);
+                trace_view_update_filters(info->treeview,
+                                          info->ginfo->task_filter,
+                                          info->ginfo->hide_tasks);
         }
 
         if (!filter_task_count(info->ginfo->task_filter))
@@ -243,6 +242,24 @@ filter_add_task_clicked (gpointer data)
 }
 
 static void
+filter_hide_task_clicked (gpointer data)
+{
+        struct shark_info *info = data;
+
+        trace_graph_filter_hide_show_task(info->ginfo, info->selected_task);
+
+        if (info->list_filter_enabled) {
+                trace_view_update_filters(info->treeview,
+                                          info->ginfo->task_filter,
+                                          info->ginfo->hide_tasks);
+        }
+
+        if (!filter_task_count(info->ginfo->task_filter) &&
+            !filter_task_count(info->ginfo->hide_tasks))
+                info->list_filter_enabled = 0;
+}
+
+static void
 filter_clear_tasks_clicked (gpointer data)
 {
         struct shark_info *info = data;
@@ -250,7 +267,7 @@ filter_clear_tasks_clicked (gpointer data)
         trace_graph_clear_tasks(info->ginfo);
 
         if (info->list_filter_enabled)
-                trace_view_update_task_filter(info->treeview, NULL);
+                trace_view_update_filters(info->treeview, NULL, NULL);
 
         info->list_filter_enabled = 0;
 }
@@ -264,6 +281,7 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
         static GtkWidget *menu_filter_graph_enable;
         static GtkWidget *menu_filter_list_enable;
         static GtkWidget *menu_filter_add_task;
+        static GtkWidget *menu_filter_hide_task;
         static GtkWidget *menu_filter_clear_tasks;
         struct record *record;
         TraceViewRecord *vrec;
@@ -306,6 +324,14 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
                                           G_CALLBACK (filter_add_task_clicked),
                                           data);
 
+                menu_filter_hide_task = gtk_menu_item_new_with_label("Hide Task");
+                gtk_widget_show(menu_filter_hide_task);
+                gtk_menu_shell_append(GTK_MENU_SHELL (menu), menu_filter_hide_task);
+
+                g_signal_connect_swapped (G_OBJECT (menu_filter_hide_task), "activate",
+                                          G_CALLBACK (filter_hide_task_clicked),
+                                          data);
+
                 menu_filter_clear_tasks = gtk_menu_item_new_with_label("Clear Task Filter");
                 gtk_widget_show(menu_filter_clear_tasks);
                 gtk_menu_shell_append(GTK_MENU_SHELL (menu), menu_filter_clear_tasks);
@@ -350,15 +376,27 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
 
                         gtk_menu_item_set_label(GTK_MENU_ITEM(menu_filter_add_task),
                                                 text);
+
+                        if (trace_graph_hide_task_find_pid(ginfo, pid))
+                                snprintf(text, len, "Show %s-%d", comm, pid);
+                        else
+                                snprintf(text, len, "Hide %s-%d", comm, pid);
+
+                        gtk_menu_item_set_label(GTK_MENU_ITEM(menu_filter_hide_task),
+                                                text);
+
                         g_free(text);
 
                         info->selected_task = pid;
 
                         gtk_widget_show(menu_filter_add_task);
+                        gtk_widget_show(menu_filter_hide_task);
                         free_record(record);
                 }
-        } else
+        } else {
                 gtk_widget_hide(menu_filter_add_task);
+                gtk_widget_hide(menu_filter_hide_task);
+        }
 
         if (ginfo->filter_enabled)
                 gtk_menu_item_set_label(GTK_MENU_ITEM(menu_filter_graph_enable),
@@ -382,7 +420,8 @@ do_tree_popup(GtkWidget *widget, GdkEventButton *event, gpointer data)
                 gtk_widget_set_sensitive(menu_filter_list_enable, FALSE);
         }
 
-        if (filter_task_count(ginfo->task_filter))
+        if (filter_task_count(ginfo->task_filter) ||
+            filter_task_count(ginfo->hide_tasks))
                 gtk_widget_set_sensitive(menu_filter_clear_tasks, TRUE);
         else
                 gtk_widget_set_sensitive(menu_filter_clear_tasks, FALSE);
diff --git a/trace-graph.h b/trace-graph.h
index 91a3acd..d323acb 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -106,9 +106,13 @@ static inline GtkWidget *trace_graph_get_window(struct graph_info *ginfo)
 
 struct filter_task_item *
 trace_graph_filter_task_find_pid(struct graph_info *ginfo, gint pid);
+struct filter_task_item *
+trace_graph_hide_task_find_pid(struct graph_info *ginfo, gint pid);
 void trace_graph_filter_toggle(struct graph_info *ginfo);
 void trace_graph_filter_add_remove_task(struct graph_info *info,
                                         gint pid);
+void trace_graph_filter_hide_show_task(struct graph_info *ginfo,
+                                       gint pid);
 void trace_graph_clear_tasks(struct graph_info *ginfo);
 
 #endif /* _TRACE_GRAPH_H */
diff --git a/trace-view-store.c b/trace-view-store.c
index 3ea7e3b..14d8b17 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -1249,7 +1249,17 @@ gint get_next_pid(TraceViewStore *store, struct pevent *pevent, struct record *r
         return val;
 }
 
-void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *filter)
+static gboolean show_task(TraceViewStore *store, gint pid)
+{
+        return (!store->task_filter ||
+                !filter_task_count(store->task_filter) ||
+                filter_task_find_pid(store->task_filter, pid)) &&
+                (!store->hide_tasks ||
+                 !filter_task_count(store->hide_tasks) ||
+                 !filter_task_find_pid(store->hide_tasks, pid));
+}
+
+static void update_filter_tasks(TraceViewStore *store)
 {
         struct tracecmd_input *handle;
         struct event_format *event;
@@ -1261,14 +1271,6 @@ void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *fi
         gint cpu;
         gint i;
 
-        g_return_if_fail (TRACE_VIEW_IS_LIST (store));
-
-        /* We may pass in the store->task_filter. Don't free it if we do */
-        if (store->task_filter && store->task_filter != filter)
-                filter_task_hash_free(store->task_filter);
-
-        store->task_filter = filter_task_hash_copy(filter);
-
         handle = store->handle;
         pevent = tracecmd_get_pevent(store->handle);
 
@@ -1305,7 +1307,7 @@ void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *fi
                         }
 
                         pid = pevent_data_pid(pevent, record);
-                        if (!filter || filter_task_find_pid(filter, pid))
+                        if (show_task(store, pid))
                                 store->cpu_list[cpu][i].visible = 1;
                         else {
                                 if (store->sched_switch_next_field &&
@@ -1313,7 +1315,7 @@ void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *fi
                                     store->sched_switch_event->id) {
                                         /* show sched switch to task */
                                         pid = get_next_pid(store, pevent, record);
-                                        if (filter_task_find_pid(filter, pid))
+                                        if (show_task(store, pid))
                                                 store->cpu_list[cpu][i].visible = 1;
                                         else
                                                 store->cpu_list[cpu][i].visible = 0;
@@ -1331,11 +1333,60 @@ void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *fi
         merge_sort_rows_ts(store);
 }
 
+void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *filter)
+{
+        g_return_if_fail (TRACE_VIEW_IS_LIST (store));
+
+        /* We may pass in the store->task_filter. Don't free it if we do */
+        if (store->task_filter && store->task_filter != filter)
+                filter_task_hash_free(store->task_filter);
+
+        if (store->task_filter != filter)
+                store->task_filter = filter_task_hash_copy(filter);
+
+        update_filter_tasks(store);
+}
+
+void trace_view_store_hide_tasks(TraceViewStore *store, struct filter_task *filter)
+{
+        g_return_if_fail (TRACE_VIEW_IS_LIST (store));
+
+        /* We may pass in the store->task_filter. Don't free it if we do */
+        if (store->hide_tasks && store->hide_tasks != filter)
+                filter_task_hash_free(store->hide_tasks);
+
+        if (store->hide_tasks != filter)
+                store->hide_tasks = filter_task_hash_copy(filter);
+
+        update_filter_tasks(store);
+}
+
 void trace_view_store_update_filter(TraceViewStore *store)
 {
         g_return_if_fail (TRACE_VIEW_IS_LIST (store));
 
-        trace_view_store_filter_tasks(store, store->task_filter);
+        update_filter_tasks(store);
+}
+
+void trace_view_store_assign_filters(TraceViewStore *store,
+                                     struct filter_task *task_filter,
+                                     struct filter_task *hide_tasks)
+{
+        g_return_if_fail (TRACE_VIEW_IS_LIST (store));
+
+        /* We may pass in the store->task_filter. Don't free it if we do */
+        if (store->task_filter && store->task_filter != task_filter)
+                filter_task_hash_free(store->task_filter);
+
+        if (store->hide_tasks && store->hide_tasks != hide_tasks)
+                filter_task_hash_free(store->hide_tasks);
+
+        if (store->hide_tasks != hide_tasks)
+                store->hide_tasks = filter_task_hash_copy(hide_tasks);
+
+        if (store->task_filter != task_filter)
+                store->task_filter = filter_task_hash_copy(task_filter);
+
 }
 
 
diff --git a/trace-view-store.h b/trace-view-store.h
index 07c3a24..bceb2de 100644
--- a/trace-view-store.h
+++ b/trace-view-store.h
@@ -98,6 +98,7 @@ struct trace_view_store
         gint                    systems_size; /* size of systems array */
         gint                    event_types_size; /* size of event_types array */
         struct filter_task      *task_filter;   /* hash of tasks to filter on */
+        struct filter_task      *hide_tasks;    /* hash of tasks to not display */
 
         gint                    all_cpus;   /* set 1 when all cpus are enabled */
                                                 /* else */
@@ -122,6 +123,12 @@ gint trace_view_store_get_timestamp_visible_row(TraceViewStore *store, guint64 t
 
 void trace_view_store_filter_tasks(TraceViewStore *store, struct filter_task *filter);
 
+void trace_view_store_hide_tasks(TraceViewStore *store, struct filter_task *filter);
+
+void trace_view_store_assign_filters(TraceViewStore *store,
+                                     struct filter_task *task_filter,
+                                     struct filter_task *hide_tasks);
+
 TraceViewRecord *trace_view_store_get_row(TraceViewStore *store, gint row);
 
 gboolean trace_view_store_system_enabled(TraceViewStore *store, const gchar *system);
@@ -198,6 +205,12 @@ static inline gint trace_view_store_get_page(TraceViewStore *store)
         return store->page;
 }
 
+static inline gint trace_view_store_visible_rows(TraceViewStore *store)
+{
+        g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), 0);
+        return store->visible_rows;
+}
+
 static inline GtkWidget *trace_view_store_get_spin(TraceViewStore *store)
 {
         g_return_val_if_fail (TRACE_VIEW_IS_LIST (store), NULL);
@@ -222,5 +235,4 @@ static inline gint *trace_view_store_get_events_enabled(TraceViewStore *store)
         return store->event_types;
 }
 
-
 #endif /* _trace_view_store_h_included_ */
diff --git a/trace-view.c b/trace-view.c
index c73f95a..a00e877 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -271,7 +271,9 @@ void trace_view_make_selection_visible(GtkWidget *treeview)
         gtk_tree_path_free(path);
 }
 
-void trace_view_update_task_filter(GtkWidget *treeview, struct filter_task *filter)
+void trace_view_update_filters(GtkWidget *treeview,
+                               struct filter_task *task_filter,
+                               struct filter_task *hide_tasks)
 {
         GtkTreeView *tree = GTK_TREE_VIEW(treeview);
         TraceViewRecord *vrec;
@@ -293,13 +295,14 @@ void trace_view_update_task_filter(GtkWidget *treeview, struct filter_task *filt
         g_object_ref(model);
         gtk_tree_view_set_model(tree, NULL);
 
-        trace_view_store_filter_tasks(TRACE_VIEW_STORE(model), filter);
+        trace_view_store_assign_filters(TRACE_VIEW_STORE(model), task_filter, hide_tasks);
+        trace_view_store_update_filter(TRACE_VIEW_STORE(model));
 
         gtk_tree_view_set_model(tree, model);
         g_object_unref(model);
 
         /* Keep selection near previous selection */
-        if (row >= 0)
+        if (row >= 0 && trace_view_store_visible_rows(TRACE_VIEW_STORE(model)))
                 trace_view_select(treeview, time);
 }
 
diff --git a/trace-view.h b/trace-view.h
index 2b34f23..b637d82 100644
--- a/trace-view.h
+++ b/trace-view.h
@@ -10,7 +10,10 @@ trace_view_load(GtkWidget *view, struct tracecmd_input *handle,
 
 void trace_view(int argc, char **argv);
 
-void trace_view_update_task_filter(GtkWidget *treeview, struct filter_task *filter);
+void trace_view_update_filters(GtkWidget *treeview,
+                               struct filter_task *task_filter,
+                               struct filter_task *hide_tasks);
+
 void trace_view_make_selection_visible(GtkWidget *treeview);
 
 void trace_view_select(GtkWidget *treeview, guint64 time);