7 files changed, 132 insertions, 39 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index e0ab1ed..91ecf82 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -223,6 +223,38 @@ static void update_title(GtkWidget *window, const gchar *file)
         g_free(str);
 }
 
+static void unsync_task_filters(struct shark_info *info)
+{
+        info->sync_task_filters = 0;
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->task_sync_menu),
+                                "Sync Graph and List Task Filters");
+
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_task_menu),
+                                "graph tasks");
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_hide_task_menu),
+                                "graph hide tasks");
+        gtk_widget_show(info->list_task_menu);
+        gtk_widget_show(info->list_hide_task_menu);
+
+        /* The list now uses its own hash */
+        info->list_task_filter = filter_task_hash_copy(info->ginfo->task_filter);
+        info->list_hide_tasks = filter_task_hash_copy(info->ginfo->hide_tasks);
+}
+
+static void unsync_event_filters(struct shark_info *info)
+{
+        info->sync_event_filters = 0;
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->events_sync_menu),
+                                "Sync Graph and List Event Filters");
+
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_events_menu),
+                                "graph events");
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_adv_events_menu),
+                                "graph advanced events");
+        gtk_widget_show(info->list_events_menu);
+        gtk_widget_show(info->list_adv_events_menu);
+}
+
 static void
 /* Callback for the clicked signal of the Load button */
 load_clicked (gpointer data)
@@ -254,24 +286,64 @@ load_filters_clicked (gpointer data)
         struct graph_info *ginfo = info->ginfo;
         GtkTreeView *trace_tree = GTK_TREE_VIEW(info->treeview);
         struct tracecmd_xml_handle *handle;
+        struct filter_task *task_filter;
+        struct filter_task *hide_tasks;
         gchar *filename;
+        int ret;
 
         filename = trace_get_file_dialog("Load Filters");
         if (!filename)
                 return;
 
         handle = tracecmd_xml_open(filename);
-        if (!handle)
+        if (!handle) {
                 warning("Could not open %s", filename);
-        g_free(filename);
+                goto out;
+        }
 
-        trace_filter_load_filters(handle, ginfo->task_filter,
-                                  ginfo->hide_tasks);
+        /* Unsync the list and graph filters */
+        if (info->sync_task_filters)
+                unsync_task_filters(info);
+        if (info->sync_event_filters)
+                unsync_event_filters(info);
+
+        ret = tracecmd_xml_system_exists(handle,
+                                         "GraphTaskFilter");
+        if (ret) {
+                filter_task_clear(ginfo->task_filter);
+                filter_task_clear(ginfo->hide_tasks);
+
+                trace_filter_load_filters(handle,
+                                          "GraphTaskFilter",
+                                          ginfo->task_filter,
+                                          ginfo->hide_tasks);
+                trace_graph_refresh_filters(ginfo);
+        }
+
+        ret = tracecmd_xml_system_exists(handle,
+                                         "ListTaskFilter");
+        if (ret) {
+
+                task_filter = info->list_task_filter;
+                hide_tasks = info->list_hide_tasks;
+                filter_task_clear(task_filter);
+                filter_task_clear(hide_tasks);
+
+                trace_filter_load_filters(handle,
+                                          "ListTaskFilter",
+                                          task_filter,
+                                          hide_tasks);
+                update_tree_view_filters(info, task_filter, hide_tasks);
+        }
 
-        trace_view_load_filters(handle, trace_tree);
         trace_graph_load_filters(ginfo, handle);
+        ret = trace_view_load_filters(handle, trace_tree);
 
         tracecmd_xml_close(handle);
+
+ out:
+        g_free(filename);
+
 }
 
 /* Callback for the clicked signal of the Save Filters button */
@@ -282,6 +354,8 @@ save_filters_clicked (gpointer data)
         struct graph_info *ginfo = info->ginfo;
         struct tracecmd_xml_handle *handle;
         GtkTreeView *trace_tree = GTK_TREE_VIEW(info->treeview);
+        struct filter_task *task_filter;
+        struct filter_task *hide_tasks;
         gchar *filename;
 
         filename = trace_get_file_dialog("Save Filters");
@@ -294,12 +368,25 @@ save_filters_clicked (gpointer data)
         g_free(filename);
 
         trace_view_save_filters(handle, trace_tree);
-
         trace_graph_save_filters(ginfo, handle);
 
-        trace_filter_save_filters(handle, ginfo->task_filter,
+        trace_filter_save_filters(handle,
+                                  "GraphTaskFilter",
+                                  ginfo->task_filter,
                                   ginfo->hide_tasks);
 
+        if (info->sync_task_filters) {
+                task_filter = ginfo->task_filter;
+                hide_tasks = ginfo->hide_tasks;
+        } else {
+                task_filter = info->list_task_filter;
+                hide_tasks = info->list_hide_tasks;
+        }
+
+        trace_filter_save_filters(handle,
+                                  "ListTaskFilter",
+                                  task_filter, hide_tasks);
+
         tracecmd_xml_close(handle);
 }
 
@@ -345,20 +432,7 @@ sync_task_filter_clicked (GtkWidget *subitem, gpointer data)
         if (info->sync_task_filters) {
                 /* Separate the List and Graph filters */
 
-                info->sync_task_filters = 0;
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->task_sync_menu),
-                                        "Sync Graph and List Task Filters");
-
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_task_menu),
-                                        "graph tasks");
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_hide_task_menu),
-                                        "graph hide tasks");
-                gtk_widget_show(info->list_task_menu);
-                gtk_widget_show(info->list_hide_task_menu);
-
-                /* The list now uses its own hash */
-                info->list_task_filter = filter_task_hash_copy(info->ginfo->task_filter);
-                info->list_hide_tasks = filter_task_hash_copy(info->ginfo->hide_tasks);
+                unsync_task_filters(info);
                 return;
         }
 
@@ -442,18 +516,7 @@ sync_events_filter_clicked (GtkWidget *subitem, gpointer data)
 
         if (info->sync_event_filters) {
                 /* Separate the List and Graph filters */
-
-                info->sync_event_filters = 0;
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->events_sync_menu),
-                                        "Sync Graph and List Event Filters");
-
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_events_menu),
-                                        "graph events");
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_adv_events_menu),
-                                        "graph advanced events");
-                gtk_widget_show(info->list_events_menu);
-                gtk_widget_show(info->list_adv_events_menu);
-
+                unsync_event_filters(info);
                 return;
         }
 
diff --git a/trace-filter.c b/trace-filter.c
index 2cc0629..b8fc76f 100644
--- a/trace-filter.c
+++ b/trace-filter.c
@@ -2196,6 +2196,7 @@ int trace_filter_load_task_filter(struct filter_task *filter,
 }
 
 int trace_filter_load_filters(struct tracecmd_xml_handle *handle,
+                              const char *system_name,
                               struct filter_task *task_filter,
                               struct filter_task *hide_tasks)
 {
@@ -2203,7 +2204,7 @@ int trace_filter_load_filters(struct tracecmd_xml_handle *handle,
         struct tracecmd_xml_system_node *syschild;
         const char *name;
 
-        system = tracecmd_xml_find_system(handle, "TraceFilter");
+        system = tracecmd_xml_find_system(handle, system_name);
         if (!system)
                 return -1;
 
@@ -2234,11 +2235,12 @@ int trace_filter_load_filters(struct tracecmd_xml_handle *handle,
 }
 
 int trace_filter_save_filters(struct tracecmd_xml_handle *handle,
+                              const char *system_name,
                               struct filter_task *task_filter,
                               struct filter_task *hide_tasks)
 {
 
-        tracecmd_xml_start_system(handle, "TraceFilter");
+        tracecmd_xml_start_system(handle, system_name);
 
         if (task_filter && filter_task_count(task_filter)) {
                 tracecmd_xml_start_sub_system(handle, "TaskFilter");
diff --git a/trace-filter.h b/trace-filter.h
index e0f9f4a..1800471 100644
--- a/trace-filter.h
+++ b/trace-filter.h
@@ -149,9 +149,11 @@ int trace_filter_load_task_filter(struct filter_task *filter,
                                   struct tracecmd_xml_handle *handle,
                                   struct tracecmd_xml_system_node *node);
 int trace_filter_load_filters(struct tracecmd_xml_handle *handle,
+                              const char *system_name,
                               struct filter_task *task_filter,
                               struct filter_task *hide_tasks);
 int trace_filter_save_filters(struct tracecmd_xml_handle *handle,
+                              const char *system_name,
                               struct filter_task *task_filter,
                               struct filter_task *hide_tasks);
 
diff --git a/trace-graph-main.c b/trace-graph-main.c
index 2ba9447..b4f05fb 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -171,7 +171,9 @@ load_filters_clicked (gpointer data)
                 warning("Could not open %s", filename);
         g_free(filename);
 
-        trace_filter_load_filters(handle, ginfo->task_filter,
+        trace_filter_load_filters(handle,
+                                  "GraphTaskFilter",
+                                  ginfo->task_filter,
                                   ginfo->hide_tasks);
 
         trace_graph_load_filters(ginfo, handle);
@@ -196,7 +198,9 @@ save_filters_clicked (gpointer data)
                 warning("Could not create %s", filename);
         g_free(filename);
 
-        trace_filter_save_filters(handle, ginfo->task_filter,
+        trace_filter_save_filters(handle,
+                                  "GraphTaskFilter",
+                                  ginfo->task_filter,
                                   ginfo->hide_tasks);
 
         trace_graph_save_filters(ginfo, handle);
diff --git a/trace-view-main.c b/trace-view-main.c
index 8fa9aa6..59d6838 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -102,7 +102,9 @@ load_filters_clicked (gpointer data)
         }
         g_free(filename);
 
-        trace_filter_load_filters(handle, info->task_filter,
+        trace_filter_load_filters(handle,
+                                  "ListTaskFilter",
+                                  info->task_filter,
                                   info->hide_tasks);
 
         trace_view_load_filters(handle, trace_tree);
@@ -128,7 +130,9 @@ save_filters_clicked (gpointer data)
                 warning("Could not create %s", filename);
         g_free(filename);
 
-        trace_filter_save_filters(handle, info->task_filter, info->hide_tasks);
+        trace_filter_save_filters(handle,
+                                  "ListTaskFilter",
+                                  info->task_filter, info->hide_tasks);
         trace_view_save_filters(handle, trace_tree);
 
         tracecmd_xml_close(handle);
diff --git a/trace-xml.c b/trace-xml.c
index 62473fb..bef1f9f 100644
--- a/trace-xml.c
+++ b/trace-xml.c
@@ -230,3 +230,19 @@ void tracecmd_xml_free_system(struct tracecmd_xml_system *system)
         xmlXPathFreeObject(system->result);
         free(system);
 }
+
+int tracecmd_xml_system_exists(struct tracecmd_xml_handle *handle,
+                               const char *system)
+{
+        struct tracecmd_xml_system *sys;
+        int exists = 0;
+
+        sys = tracecmd_xml_find_system(handle, system);
+        if (sys) {
+                exists = 1;
+                tracecmd_xml_free_system(sys);
+        }
+
+        return exists;
+}
+
diff --git a/trace-xml.h b/trace-xml.h
index f84907d..d1f62b0 100644
--- a/trace-xml.h
+++ b/trace-xml.h
@@ -56,5 +56,7 @@ struct tracecmd_xml_system_node *
 tracecmd_xml_node_next(struct tracecmd_xml_system_node *tnode);
 const char *tracecmd_xml_node_value(struct tracecmd_xml_handle *handle,
                                     struct tracecmd_xml_system_node *tnode);
+int tracecmd_xml_system_exists(struct tracecmd_xml_handle *handle,
+                               const char *system);
 
 #endif /* __TRACE_XML_H */