trace-view: Add save and load of task filters

Include saving of the task filters to the filter file as well as
the ability to load them.

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

7 files changed, 96 insertions, 48 deletions

diff --git a/trace-filter.c b/trace-filter.c
index efdb5fa..b6035ad 100644
--- a/trace-filter.c
+++ b/trace-filter.c
@@ -2207,6 +2207,21 @@ int trace_filter_save_events(struct tracecmd_xml_handle *handle,
 int trace_filter_save_tasks(struct tracecmd_xml_handle *handle,
                             struct filter_task *filter)
 {
+        char buffer[100];
+        int *pids;
+        int i;
+
+        pids = filter_task_pids(filter);
+        if (!pids)
+                return -1;
+
+        for (i = 0; pids[i] >= 0; i++) {
+                snprintf(buffer, 100, "%d", pids[i]);
+                tracecmd_xml_write_element(handle, "Task", buffer);
+        }
+
+        free(pids);
+
         return 0;
 }
 
@@ -2284,3 +2299,31 @@ int trace_filter_load_events(struct event_filter *event_filter,
 
         return 0;
 }
+
+int trace_filter_load_task_filter(struct filter_task *filter,
+                                  struct tracecmd_xml_handle *handle,
+                                  struct tracecmd_xml_system_node *node)
+{
+        const char *name;
+        const char *task;
+        int pid;
+
+        if (!filter)
+                return 0;
+
+        node = tracecmd_xml_node_child(node);
+
+        while (node) {
+                name = tracecmd_xml_node_type(node);
+
+                if (strcmp(name, "Task") == 0) {
+                        task = tracecmd_xml_node_value(handle, node);
+                        pid = atoi(task);
+                        if (!filter_task_find_pid(filter, pid))
+                                filter_task_add_pid(filter, pid);
+                }
+                node = tracecmd_xml_node_next(node);
+        }
+
+        return 0;
+}
diff --git a/trace-filter.h b/trace-filter.h
index 915b174..fd60bce 100644
--- a/trace-filter.h
+++ b/trace-filter.h
@@ -145,6 +145,9 @@ int trace_filter_save_tasks(struct tracecmd_xml_handle *handle,
 int trace_filter_load_events(struct event_filter *event_filter,
                              struct tracecmd_xml_handle *handle,
                              struct tracecmd_xml_system_node *node);
+int trace_filter_load_task_filter(struct filter_task *filter,
+                                  struct tracecmd_xml_handle *handle,
+                                  struct tracecmd_xml_system_node *node);
 
 /* put here because there's no other place */
 
diff --git a/trace-hash.c b/trace-hash.c
index 1197913..3349715 100644
--- a/trace-hash.c
+++ b/trace-hash.c
@@ -19,6 +19,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 
@@ -155,3 +156,29 @@ struct filter_task *filter_task_hash_copy(struct filter_task *hash)
 
         return new_hash;
 }
+
+int *filter_task_pids(struct filter_task *hash)
+{
+        struct filter_task_item *task;
+        int *pids;
+        int count = 0;
+        int i;
+
+        if (!hash->count)
+                return NULL;
+
+        pids = malloc(sizeof(*pids) * (hash->count + 1));
+        if (!pids)
+                return NULL;
+
+        for (i = 0; i < FILTER_TASK_HASH_SIZE; i++) {
+                task = hash->hash[i];
+                while (task) {
+                        pids[count++] = task->pid;
+                        task = task->next;
+                }
+        }
+        pids[count] = -1;
+
+        return pids;
+}
diff --git a/trace-hash.h b/trace-hash.h
index 1aaa828..29088e7 100644
--- a/trace-hash.h
+++ b/trace-hash.h
@@ -42,6 +42,7 @@ void filter_task_clear(struct filter_task *hash);
 struct filter_task *filter_task_hash_alloc(void);
 void filter_task_hash_free(struct filter_task *hash);
 struct filter_task *filter_task_hash_copy(struct filter_task *hash);
+int *filter_task_pids(struct filter_task *hash);
 
 static inline gint filter_task_count(struct filter_task *hash)
 {
diff --git a/trace-view-main.c b/trace-view-main.c
index 74922fb..af9dc5d 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -97,7 +97,8 @@ load_filters_clicked (gpointer data)
                 warning("Could not open %s", filename);
         g_free(filename);
 
-        trace_view_load_filters(handle, trace_tree);
+        trace_view_load_filters(handle, trace_tree, info->task_filter,
+                                info->hide_tasks);
 
         tracecmd_xml_close(handle);
 }
@@ -120,7 +121,8 @@ save_filters_clicked (gpointer data)
                 warning("Could not create %s", filename);
         g_free(filename);
 
-        trace_view_save_filters(handle, trace_tree);
+        trace_view_save_filters(handle, trace_tree,
+                                info->task_filter, info->hide_tasks);
 
         tracecmd_xml_close(handle);
 }
diff --git a/trace-view.c b/trace-view.c
index 094f226..c1ce4ff 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -873,7 +873,9 @@ void trace_view_search_setup(GtkBox *box, GtkTreeView *treeview)
 }
 
 int trace_view_save_filters(struct tracecmd_xml_handle *handle,
-                            GtkTreeView *trace_tree)
+                            GtkTreeView *trace_tree,
+                            struct filter_task *task_filter,
+                            struct filter_task *hide_tasks)
 {
         struct event_filter *event_filter;
         GtkTreeModel *model;
@@ -902,15 +904,15 @@ int trace_view_save_filters(struct tracecmd_xml_handle *handle,
 
         tracecmd_xml_end_sub_system(handle);
 
-        if (store->task_filter) {
+        if (task_filter && filter_task_count(task_filter)) {
                 tracecmd_xml_start_sub_system(handle, "TaskFilter");
-                trace_filter_save_tasks(handle, store->task_filter);
+                trace_filter_save_tasks(handle, task_filter);
                 tracecmd_xml_end_sub_system(handle);
         }
 
-        if (store->hide_tasks) {
+        if (hide_tasks && filter_task_count(hide_tasks)) {
                 tracecmd_xml_start_sub_system(handle, "HideTasks");
-                trace_filter_save_tasks(handle, store->hide_tasks);
+                trace_filter_save_tasks(handle, hide_tasks);
                 tracecmd_xml_end_sub_system(handle);
         }
 
@@ -951,44 +953,10 @@ static int load_event_filter(TraceViewStore *store,
         return 0;
 }
 
-static int load_task_filter(TraceViewStore *store,
-                            struct tracecmd_xml_handle *handle,
-                            struct tracecmd_xml_system_node *node)
-{
-        struct tracecmd_xml_system_node *child;
-        const char *name;
-        const char *value;
-
-        child = tracecmd_xml_node_child(node);
-        name = tracecmd_xml_node_type(child);
-        if (strcmp(name, "FilterType") == 0) {
-                value = tracecmd_xml_node_value(handle, child);
-                printf("value = %s\n", value);
-        }
-
-        return 0;
-}
-
-static int load_hide_tasks(TraceViewStore *store,
-                           struct tracecmd_xml_handle *handle,
-                           struct tracecmd_xml_system_node *node)
-{
-        struct tracecmd_xml_system_node *child;
-        const char *name;
-        const char *value;
-
-        child = tracecmd_xml_node_child(node);
-        name = tracecmd_xml_node_type(child);
-        if (strcmp(name, "FilterType") == 0) {
-                value = tracecmd_xml_node_value(handle, child);
-                printf("value = %s\n", value);
-        }
-
-        return 0;
-}
-
 int trace_view_load_filters(struct tracecmd_xml_handle *handle,
-                            GtkTreeView *trace_tree)
+                            GtkTreeView *trace_tree,
+                            struct filter_task *task_filter,
+                            struct filter_task *hide_tasks)
 {
         struct tracecmd_xml_system *system;
         struct tracecmd_xml_system_node *syschild;
@@ -1017,10 +985,10 @@ int trace_view_load_filters(struct tracecmd_xml_handle *handle,
                         load_event_filter(store, handle, syschild);
 
                 else if (strcmp(name, "TaskFilter") == 0)
-                        load_task_filter(store, handle, syschild);
+                        trace_filter_load_task_filter(task_filter, handle, syschild);
 
                 else if (strcmp(name, "HideTasks") == 0)
-                        load_hide_tasks(store, handle, syschild);
+                        trace_filter_load_task_filter(hide_tasks, handle, syschild);
 
                 syschild = tracecmd_xml_node_next(syschild);
         } while (syschild);
diff --git a/trace-view.h b/trace-view.h
index 81dac6f..b0ba7ed 100644
--- a/trace-view.h
+++ b/trace-view.h
@@ -67,8 +67,12 @@ void trace_view_search_setup(GtkBox *box, GtkTreeView *treeview);
 gint trace_view_get_selected_row(GtkWidget *treeview);
 
 int trace_view_save_filters(struct tracecmd_xml_handle *handle,
-                            GtkTreeView *treeview);
+                            GtkTreeView *treeview,
+                            struct filter_task *task_filter,
+                            struct filter_task *hide_tasks);
 int trace_view_load_filters(struct tracecmd_xml_handle *handle,
-                            GtkTreeView *treeview);
+                            GtkTreeView *treeview,
+                            struct filter_task *task_filter,
+                            struct filter_task *hide_tasks);
 
 #endif /* _TRACE_VIEW_H */