7 files changed, 366 insertions, 10 deletions

diff --git a/trace-filter.c b/trace-filter.c
index 904c9cb..efdb5fa 100644
--- a/trace-filter.c
+++ b/trace-filter.c
@@ -2209,3 +2209,78 @@ int trace_filter_save_tasks(struct tracecmd_xml_handle *handle,
 {
         return 0;
 }
+
+int trace_filter_load_events(struct event_filter *event_filter,
+                             struct tracecmd_xml_handle *handle,
+                             struct tracecmd_xml_system_node *node)
+{
+        struct tracecmd_xml_system_node *child;
+        const char *name;
+        const char *system;
+        const char *event;
+        const char *value;
+        char *buffer;
+
+        while (node) {
+                name = tracecmd_xml_node_type(node);
+
+                if (strcmp(name, "System") == 0) {
+                        system = tracecmd_xml_node_value(handle, node);
+                        pevent_filter_add_filter_str(event_filter,
+                                                     system, NULL);
+                } else if (strcmp(name, "Event") == 0) {
+                        system = NULL;
+                        event = NULL;
+                        value = NULL;
+                        child = tracecmd_xml_node_child(node);
+                        if (!child)
+                                return -1;
+                        do {
+                                name = tracecmd_xml_node_type(child);
+                                if (strcmp(name, "System") == 0)
+                                        system = tracecmd_xml_node_value(handle, child);
+                                else if (strcmp(name, "Name") == 0)
+                                        event = tracecmd_xml_node_value(handle, child);
+                                else if (strcmp(name, "Advanced") == 0)
+                                        value = tracecmd_xml_node_value(handle, child);
+                                child = tracecmd_xml_node_next(child);
+                        } while (child);
+
+                        if (event || system) {
+                                if (event && system) {
+                                        if (value) {
+                                                buffer = malloc_or_die(strlen(event) +
+                                                                       strlen(system) +
+                                                                       strlen(value) + 3);
+                                                sprintf(buffer, "%s/%s:%s",
+                                                        system, event, value);
+                                        } else {
+                                                buffer = malloc_or_die(strlen(event) +
+                                                                       strlen(system) + 2);
+                                                sprintf(buffer, "%s/%s",
+                                                        system, event);
+                                        }
+                                } else {
+                                        if (!event)
+                                                event = system;
+                                        if (value) {
+                                                buffer = malloc_or_die(strlen(event) +
+                                                                       strlen(value) + 2);
+                                                sprintf(buffer, "%s:%s",
+                                                        event, value);
+                                        } else {
+                                                buffer = malloc_or_die(strlen(event) + 1);
+                                                sprintf(buffer, "%s", event);
+                                        }
+                                }
+                                pevent_filter_add_filter_str(event_filter,
+                                                             buffer, NULL);
+                                free(buffer);
+                        }
+                }
+
+                node = tracecmd_xml_node_next(node);
+        }
+
+        return 0;
+}
diff --git a/trace-filter.h b/trace-filter.h
index 7575244..915b174 100644
--- a/trace-filter.h
+++ b/trace-filter.h
@@ -135,16 +135,20 @@ typedef void (*trace_filter_cpu_cb_func)(gboolean accept,
 void trace_filter_cpu_dialog(gboolean all_cpus, guint64 *cpu_mask_selected, gint cpus,
                              trace_filter_cpu_cb_func func, gpointer data);
 
-/* put here because there's no other place */
-
-int str_cmp(const void *a, const void *b);
-int id_cmp(const void *a, const void *b);
-
 void trace_array_add(gint **array, gint *count, gint val);
 
+/* save and load filters */
 int trace_filter_save_events(struct tracecmd_xml_handle *handle,
                              struct event_filter *filter);
 int trace_filter_save_tasks(struct tracecmd_xml_handle *handle,
                             struct filter_task *filter);
+int trace_filter_load_events(struct event_filter *event_filter,
+                             struct tracecmd_xml_handle *handle,
+                             struct tracecmd_xml_system_node *node);
+
+/* put here because there's no other place */
+
+int str_cmp(const void *a, const void *b);
+int id_cmp(const void *a, const void *b);
 
 #endif /* _TRACE_FILTER_H */
diff --git a/trace-view-main.c b/trace-view-main.c
index 52fb4f8..22b9e32 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -72,7 +72,30 @@ load_clicked (gpointer data)
         g_free(filename);
 }
 
-/* Callback for the clicked signal of the Save State button */
+/* Callback for the clicked signal of the Load Filters button */
+static void
+load_filters_clicked (gpointer data)
+{
+        struct trace_tree_info *info = data;
+        GtkTreeView *trace_tree = GTK_TREE_VIEW(info->trace_tree);
+        struct tracecmd_xml_handle *handle;
+        gchar *filename;
+
+        filename = trace_get_file_dialog("Load Filters");
+        if (!filename)
+                return;
+
+        handle = tracecmd_xml_open(filename);
+        if (!handle)
+                warning("Could not open %s", filename);
+        g_free(filename);
+
+        trace_view_load_filters(handle, trace_tree);
+
+        tracecmd_xml_close(handle);
+}
+
+/* Callback for the clicked signal of the Save Filters button */
 static void
 save_filters_clicked (gpointer data)
 {
@@ -81,13 +104,13 @@ save_filters_clicked (gpointer data)
         struct tracecmd_xml_handle *handle;
         gchar *filename;
 
-        filename = trace_get_file_dialog("Save State");
+        filename = trace_get_file_dialog("Save Filters");
         if (!filename)
                 return;
 
         handle = tracecmd_xml_create(filename);
         if (!handle)
-                warning("Could not create save state %s", filename);
+                warning("Could not create %s", filename);
         g_free(filename);
 
         trace_view_save_filters(handle, trace_tree);
@@ -286,7 +309,22 @@ void trace_view(int argc, char **argv)
         gtk_widget_show(sub_item);
 
 
-        /* --- File - Save State Option --- */
+        /* --- File - Load Filter Option --- */
+
+        sub_item = gtk_menu_item_new_with_label("Load filters");
+
+        /* Add them to the menu */
+        gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
+
+        g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
+                                  G_CALLBACK (load_filters_clicked),
+                                  (gpointer) &tree_info);
+
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
+
+
+        /* --- File - Save Filter Option --- */
 
         sub_item = gtk_menu_item_new_with_label("Save filters");
 
diff --git a/trace-view.c b/trace-view.c
index c183b19..094f226 100644
--- a/trace-view.c
+++ b/trace-view.c
@@ -918,3 +918,119 @@ int trace_view_save_filters(struct tracecmd_xml_handle *handle,
 
         return 0;
 }
+
+static int load_event_filter(TraceViewStore *store,
+                             struct tracecmd_xml_handle *handle,
+                             struct tracecmd_xml_system_node *node)
+{
+        struct tracecmd_xml_system_node *child;
+        struct event_filter *event_filter;
+        const char *name;
+        const char *value;
+
+        event_filter = trace_view_store_get_event_filter(store);
+
+        child = tracecmd_xml_node_child(node);
+        name = tracecmd_xml_node_type(child);
+        if (strcmp(name, "FilterType") != 0)
+                return -1;
+
+        value = tracecmd_xml_node_value(handle, child);
+        /* Do nothing with all events enabled */
+        if (strcmp(value, "all events") == 0)
+                return 0;
+
+        node = tracecmd_xml_node_next(child);
+        if (!node)
+                return -1;
+
+        trace_view_store_clear_all_events_enabled(store);
+
+        trace_filter_load_events(event_filter, handle, node);
+
+        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)
+{
+        struct tracecmd_xml_system *system;
+        struct tracecmd_xml_system_node *syschild;
+        GtkTreeModel *model;
+        TraceViewStore *store;
+        const char *name;
+
+        model = gtk_tree_view_get_model(trace_tree);
+        if (!model)
+                return -1;
+
+        store = TRACE_VIEW_STORE(model);
+
+        system = tracecmd_xml_find_system(handle, "TraceView");
+        if (!system)
+                return -1;
+
+        syschild = tracecmd_xml_system_node(system);
+        if (!syschild)
+                goto out_free_sys;
+
+        do {
+                name = tracecmd_xml_node_type(syschild);
+
+                if (strcmp(name, "EventFilter") == 0)
+                        load_event_filter(store, handle, syschild);
+
+                else if (strcmp(name, "TaskFilter") == 0)
+                        load_task_filter(store, handle, syschild);
+
+                else if (strcmp(name, "HideTasks") == 0)
+                        load_hide_tasks(store, handle, syschild);
+
+                syschild = tracecmd_xml_node_next(syschild);
+        } while (syschild);
+
+        tracecmd_xml_free_system(system);
+
+        update_rows(trace_tree, store);
+        return 0;
+
+ out_free_sys:
+        tracecmd_xml_free_system(system);
+        return -1;
+}
diff --git a/trace-view.h b/trace-view.h
index 5ad33bf..81dac6f 100644
--- a/trace-view.h
+++ b/trace-view.h
@@ -68,5 +68,7 @@ gint trace_view_get_selected_row(GtkWidget *treeview);
 
 int trace_view_save_filters(struct tracecmd_xml_handle *handle,
                             GtkTreeView *treeview);
+int trace_view_load_filters(struct tracecmd_xml_handle *handle,
+                            GtkTreeView *treeview);
 
 #endif /* _TRACE_VIEW_H */
diff --git a/trace-xml.c b/trace-xml.c
index 0bc130c..47cb3c9 100644
--- a/trace-xml.c
+++ b/trace-xml.c
@@ -25,13 +25,20 @@
 
 #include <libxml/xmlwriter.h>
 #include <libxml/parser.h>
-#include <libxml/encoding.h>
+#include <libxml/xpath.h>
 
 #include "trace-cmd.h"
 #include "trace-xml.h"
 
 struct tracecmd_xml_handle {
         xmlTextWriterPtr        writer;
+        xmlDocPtr               doc;
+};
+
+struct tracecmd_xml_system {
+        struct tracecmd_xml_handle *handle;
+        xmlXPathObjectPtr       result;
+        xmlNodePtr              cur;
 };
 
 #define TRACE_ENCODING "UTF-8"
@@ -122,6 +129,101 @@ void tracecmd_xml_close(struct tracecmd_xml_handle *handle)
                 xmlTextWriterEndDocument(handle->writer);
                 xmlFreeTextWriter(handle->writer);
         }
+        if (handle->doc) {
+                xmlFreeDoc(handle->doc);
+        }
+        free(handle);
+}
+
+/***********************************************************/
+/***  Reading XML files                                  ***/
+/***********************************************************/
+
+
+struct tracecmd_xml_handle *tracecmd_xml_open(const char *file)
+{
+        struct tracecmd_xml_handle *handle;
 
+        handle = malloc_or_die(sizeof(*handle));
+        memset(handle, 0, sizeof(*handle));
+
+        handle->doc = xmlParseFile(file);
+        if (!handle->doc)
+                goto fail_free;
+
+        return handle;
+
+ fail_free:
         free(handle);
+        return NULL;
+}
+
+struct tracecmd_xml_system *
+tracecmd_xml_find_system(struct tracecmd_xml_handle *handle,
+                         const char *system)
+{
+        struct tracecmd_xml_system *sys;
+        xmlXPathContextPtr context;
+        xmlXPathObjectPtr result;
+        xmlChar *xpath;
+        char *path;
+
+        path = malloc_or_die(strlen(system) + 3);
+        sprintf(path, "//%s", system);
+        xpath = BAD_CAST path;
+
+        context = xmlXPathNewContext(handle->doc);
+        result = xmlXPathEvalExpression(xpath, context);
+        free(path);
+
+        if (xmlXPathNodeSetIsEmpty(result->nodesetval)) {
+                xmlXPathFreeObject(result);
+                return NULL;
+        }
+
+        sys = malloc_or_die(sizeof(*sys));
+        sys->handle = handle;
+        sys->result = result;
+        sys->cur = result->nodesetval->nodeTab[0]->xmlChildrenNode;
+
+        return sys;
+}
+
+struct tracecmd_xml_system_node *
+tracecmd_xml_system_node(struct tracecmd_xml_system *system)
+{
+        return (struct tracecmd_xml_system_node *)system->cur;
+}
+
+const char *tracecmd_xml_node_type(struct tracecmd_xml_system_node *tnode)
+{
+        xmlNodePtr node = (xmlNodePtr)tnode;
+        return (const char *)node->name;
+}
+
+struct tracecmd_xml_system_node *
+tracecmd_xml_node_child(struct tracecmd_xml_system_node *tnode)
+{
+        xmlNodePtr node = (xmlNodePtr)tnode;
+        return (struct tracecmd_xml_system_node *)node->xmlChildrenNode;
+}
+
+struct tracecmd_xml_system_node *
+tracecmd_xml_node_next(struct tracecmd_xml_system_node *tnode)
+{
+        xmlNodePtr node = (xmlNodePtr)tnode;
+        return (struct tracecmd_xml_system_node *)node->next;
+}
+
+const char *tracecmd_xml_node_value(struct tracecmd_xml_handle *handle,
+                                    struct tracecmd_xml_system_node *tnode)
+{
+        xmlNodePtr node = (xmlNodePtr)tnode;
+        return (const char *)xmlNodeListGetString(handle->doc, node->xmlChildrenNode, 1);
+}
+
+void tracecmd_xml_free_system(struct tracecmd_xml_system *system)
+{
+        xmlXPathFreeObject(system->result);
+        free(system);
 }
diff --git a/trace-xml.h b/trace-xml.h
index 41f6193..4006538 100644
--- a/trace-xml.h
+++ b/trace-xml.h
@@ -22,8 +22,11 @@
 #define __TRACE_XML_H
 
 struct tracecmd_xml_handle;
+struct tacecmd_xml_system;
+struct tacecmd_xml_system_node;
 
 struct tracecmd_xml_handle *tracecmd_xml_create(const char *name);
+struct tracecmd_xml_handle *tracecmd_xml_open(const char *name);
 void tracecmd_xml_close(struct tracecmd_xml_handle *handle);
 
 int tracecmd_xml_start_system(struct tracecmd_xml_handle *handle,
@@ -38,4 +41,20 @@ int tracecmd_xml_write_element(struct tracecmd_xml_handle *handle,
                                const char *obj,
                                const char *fmt, ...);
 
+struct tracecmd_xml_handle *tracecmd_xml_open(const char *file);
+
+struct tracecmd_xml_system *
+tracecmd_xml_find_system(struct tracecmd_xml_handle *handle,
+                         const char *system);
+void tracecmd_xml_free_system(struct tracecmd_xml_system *system);
+struct tracecmd_xml_system_node *
+tracecmd_xml_system_node(struct tracecmd_xml_system *system);
+const char *tracecmd_xml_node_type(struct tracecmd_xml_system_node *tnode);
+struct tracecmd_xml_system_node *
+tracecmd_xml_node_child(struct tracecmd_xml_system_node *tnode);
+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);
+
 #endif /* __TRACE_XML_H */