commit 4dca43ba53304efc776116a220c634d887866ec9
author Steven Rostedt <srostedt@redhat.com> Thu Feb 11 11:14:03 2010 -0500
committer Steven Rostedt <rostedt@goodmis.org> Thu Feb 11 11:14:03 2010 -0500
tree b4b301b345e01d607179dd8364a855112268bca9
parent ef9f0772f8d02565b70bfc580cdefd003b58a1b4

kernelshark/trace-graph: Free up graph info

Have kernelshark call the graph info destructor.
Have the graph info destructor free the lists.

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

kernel-shark.c

diff --git a/kernel-shark.c b/kernel-shark.c
index 50e2659..784cb99 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -116,6 +116,7 @@
 static void free_info(struct shark_info *info)
 {
 	tracecmd_close(info->handle);
+	trace_graph_free_info(info->ginfo);
 	free(info->ginfo);
 	free(info);
 }

trace-graph.c

diff --git a/trace-graph.c b/trace-graph.c
index 7797210..3440497 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -2039,7 +2039,10 @@
 
 void trace_graph_free_info(struct graph_info *ginfo)
 {
-	tracecmd_close(ginfo->handle);
+	if (ginfo->handle) {
+		trace_graph_plot_free(ginfo);
+		tracecmd_close(ginfo->handle);
+	}
 	ginfo->handle = NULL;
 }
 
@@ -2053,11 +2056,8 @@
 	if (!handle)
 		return -1;
 
-	trace_graph_plot_free(ginfo);
 	trace_graph_plot_init(ginfo);
-
-	if (ginfo->handle)
-		trace_graph_free_info(ginfo);
+	trace_graph_free_info(ginfo);
 
 	ginfo->handle = handle;
 	tracecmd_ref(handle);