From 4dca43ba53304efc776116a220c634d887866ec9 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 11 Feb 2010 11:14:03 -0500 Subject: 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 --- kernel-shark.c | 1 + trace-graph.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) 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 ks_graph_filter(struct graph_info *ginfo, static void free_info(struct shark_info *info) { tracecmd_close(info->handle); + trace_graph_free_info(info->ginfo); free(info->ginfo); free(info); } 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 @@ create_graph_info(struct graph_info *ginfo) 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 @@ static int load_handle(struct graph_info *ginfo, 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); -- cgit v1.2.2