3 files changed, 91 insertions, 25 deletions

diff --git a/kernel-shark.c b/kernel-shark.c
index 91ecf82..3a0d0fb 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -241,6 +241,19 @@ static void unsync_task_filters(struct shark_info *info)
         info->list_hide_tasks = filter_task_hash_copy(info->ginfo->hide_tasks);
 }
 
+static void sync_task_filters(struct shark_info *info)
+{
+        info->sync_task_filters = 1;
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->task_sync_menu),
+                                "Unsync Graph and List Task Filters");
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_task_menu),
+                                "tasks");
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_hide_task_menu),
+                                "hide tasks");
+        gtk_widget_hide(info->list_task_menu);
+        gtk_widget_hide(info->list_hide_task_menu);
+}
+
 static void unsync_event_filters(struct shark_info *info)
 {
         info->sync_event_filters = 0;
@@ -255,6 +268,19 @@ static void unsync_event_filters(struct shark_info *info)
         gtk_widget_show(info->list_adv_events_menu);
 }
 
+static void sync_event_filters(struct shark_info *info)
+{
+        info->sync_event_filters = 1;
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->events_sync_menu),
+                                "Unsync Graph and List Event Filters");
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_events_menu),
+                                "events");
+        gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_adv_events_menu),
+                                "advanced events");
+        gtk_widget_hide(info->list_events_menu);
+        gtk_widget_hide(info->list_adv_events_menu);
+}
+
 static void
 /* Callback for the clicked signal of the Load button */
 load_clicked (gpointer data)
@@ -341,6 +367,16 @@ load_filters_clicked (gpointer data)
 
         tracecmd_xml_close(handle);
 
+        /*
+         * If the events or tasks filters are the same for both
+         * the list and graph, then sync them back.
+         */
+        if (filter_task_compare(ginfo->task_filter,
+                                info->list_task_filter) &&
+            filter_task_compare(ginfo->hide_tasks,
+                                info->list_hide_tasks))
+                sync_task_filters(info);
+
  out:
         g_free(filename);
 
@@ -442,9 +478,17 @@ sync_task_filter_clicked (GtkWidget *subitem, gpointer data)
 
         store = TRACE_VIEW_STORE(model);
 
-        /* Ask user which way to sync */
-        result = trace_sync_select_menu("Sync Task Filters",
-                                        selections, &keep);
+        /* If they are already equal, then just perminently sync them */
+        if (filter_task_compare(info->ginfo->task_filter,
+                                info->list_task_filter) &&
+            filter_task_compare(info->ginfo->hide_tasks,
+                                info->list_hide_tasks))
+                result = 2;
+
+        else
+                /* Ask user which way to sync */
+                result = trace_sync_select_menu("Sync Task Filters",
+                                                selections, &keep);
 
         switch (result) {
         case 0:
@@ -480,21 +524,15 @@ sync_task_filter_clicked (GtkWidget *subitem, gpointer data)
                         info->list_hide_tasks = NULL;
                 }
                 break;
+        case 2:
+                keep = 1;
+                break;
         default:
                 keep = 0;
         }
 
-        if (keep) {
-                info->sync_task_filters = 1;
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->task_sync_menu),
-                                        "Unsync Graph and List Task Filters");
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_task_menu),
-                                        "tasks");
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_hide_task_menu),
-                                        "hide tasks");
-                gtk_widget_hide(info->list_task_menu);
-                gtk_widget_hide(info->list_hide_task_menu);
-        }
+        if (keep)
+                sync_task_filters(info);
 }
 
 /* Callback for the clicked signal of the events sync filter button */
@@ -550,17 +588,8 @@ sync_events_filter_clicked (GtkWidget *subitem, gpointer data)
                 keep = 0;
         }
 
-        if (keep) {
-                info->sync_event_filters = 1;
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->events_sync_menu),
-                                        "Unsync Graph and List Event Filters");
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_events_menu),
-                                        "events");
-                gtk_menu_item_set_label(GTK_MENU_ITEM(info->graph_adv_events_menu),
-                                        "advanced events");
-                gtk_widget_hide(info->list_events_menu);
-                gtk_widget_hide(info->list_adv_events_menu);
-        }
+        if (keep)
+                sync_event_filters(info);
 }
 
 static void filter_list_enable_clicked (gpointer data);
diff --git a/trace-hash.c b/trace-hash.c
index 3349715..ed53ee1 100644
--- a/trace-hash.c
+++ b/trace-hash.c
@@ -182,3 +182,39 @@ int *filter_task_pids(struct filter_task *hash)
 
         return pids;
 }
+
+/**
+ * filter_task_compare - compare two task hashs to see if they are equal
+ * @hash1: one hash to compare
+ * @hash2: another hash to compare to @hash1
+ *
+ * Returns 1 if the two hashes are the same, 0 otherwise.
+ */
+int filter_task_compare(struct filter_task *hash1, struct filter_task *hash2)
+{
+        int *pids;
+        int ret = 0;
+        int i;
+
+        /* If counts don't match, then they obviously are not the same */
+        if (hash1->count != hash2->count)
+                return 0;
+
+        /* If both hashes are empty, they are the same */
+        if (!hash1->count && !hash2->count)
+                return 1;
+
+        /* Now compare the pids of one hash with the other */
+        pids = filter_task_pids(hash1);
+        for (i = 0; pids[i] >= 0; i++) {
+                if (!filter_task_find_pid(hash2, pids[i]))
+                        break;
+        }
+
+        if (pids[i] == -1)
+                ret = 1;
+
+        free(pids);
+
+        return ret;
+}
diff --git a/trace-hash.h b/trace-hash.h
index 29088e7..b5296eb 100644
--- a/trace-hash.h
+++ b/trace-hash.h
@@ -43,6 +43,7 @@ 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);
+int filter_task_compare(struct filter_task *hash1, struct filter_task *hash2);
 
 static inline gint filter_task_count(struct filter_task *hash)
 {