Merge branch 'kernelshark-devel' into trace-cmd

Conflicts:
	Makefile

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

1 files changed, 10 insertions, 0 deletions

diff --git a/trace-graph.h b/trace-graph.h
index 91ae161..15ad4b2 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -24,6 +24,7 @@
 #include <gtk/gtk.h>
 #include "trace-cmd.h"
 #include "trace-hash.h"
+#include "trace-xml.h"
 
 struct graph_info;
 
@@ -306,6 +307,15 @@ void trace_graph_copy_filter(struct graph_info *ginfo,
                              struct event_filter *event_filter);
 gint *trace_graph_task_list(struct graph_info *ginfo);
 
+int trace_graph_load_filters(struct graph_info *ginfo,
+                             struct tracecmd_xml_handle *handle);
+int trace_graph_save_filters(struct graph_info *ginfo,
+                             struct tracecmd_xml_handle *handle);
+void trace_graph_update_filters(struct graph_info *ginfo,
+                                struct filter_task *task_filter,
+                                struct filter_task *hide_tasks);
+void trace_graph_refresh_filters(struct graph_info *ginfo);
+
 /* plots */
 void trace_graph_plot_free(struct graph_info *ginfo);
 void trace_graph_plot_init(struct graph_info *ginfo);