trace-graph: Add destructor routine to plot callbacks

Added a destructor routine to the plot callbacks to be called before
the plot is destroyed. This allows the plot to clean up any resources
that it allocated before it is freed.

Also did some other minor clean ups and freeing.

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

4 files changed, 24 insertions, 5 deletions

diff --git a/trace-graph.h b/trace-graph.h
index 57d3c3b..8e75dbb 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -53,6 +53,9 @@ struct graph_plot;
  * display_info:
  *   display information about a given time. A resolution is
  *   passed in to show how much time is in 1 pixel.
+ *
+ * destroy:
+ *   destructor routine. Cleans up all resourses that the plot allocated.
  */
 struct plot_callbacks {
         int (*match_time)(struct graph_info *, struct graph_plot *,
@@ -74,6 +77,7 @@ struct plot_callbacks {
         int (*display_info)(struct graph_info *, struct graph_plot *,
                             struct trace_seq *s,
                             unsigned long long time);
+        void (*destroy)(struct graph_info *, struct graph_plot *);
 };
 
 struct graph_plot {
diff --git a/trace-plot-cpu.c b/trace-plot-cpu.c
index 6918ae4..7fd9ecc 100644
--- a/trace-plot-cpu.c
+++ b/trace-plot-cpu.c
@@ -4,7 +4,6 @@
 
 struct cpu_plot_info {
         int                     cpu;
-        struct record           *record;
         unsigned long long      last_time;
         int                     last_pid;
 };
@@ -177,7 +176,6 @@ static void cpu_plot_start(struct graph_info *ginfo, struct graph_plot *plot,
         int cpu;
 
         cpu = cpu_info->cpu;
-        cpu_info->record = NULL;
         cpu_info->last_time = 0ULL;
         cpu_info->last_pid = -1;
 
@@ -396,6 +394,13 @@ int cpu_plot_display_info(struct graph_info *ginfo,
         return 1;
 }
 
+void cpu_plot_destroy(struct graph_info *ginfo, struct graph_plot *plot)
+{
+        struct cpu_plot_info *cpu_info = plot->private;
+
+        free(cpu_info);
+}
+
 static const struct plot_callbacks cpu_plot_cb = {
         .match_time             = cpu_plot_match_time,
         .plot_event             = cpu_plot_event,
@@ -403,6 +408,7 @@ static const struct plot_callbacks cpu_plot_cb = {
         .display_last_event     = cpu_plot_display_last_event,
         .find_record            = cpu_plot_find_record,
         .display_info           = cpu_plot_display_info,
+        .destroy                = cpu_plot_destroy
 };
 
 void graph_plot_init_cpus(struct graph_info *ginfo, int cpus)
diff --git a/trace-plot-task.c b/trace-plot-task.c
index f3b0c01..abe4025 100644
--- a/trace-plot-task.c
+++ b/trace-plot-task.c
@@ -532,6 +532,13 @@ int task_plot_display_info(struct graph_info *ginfo,
         return 1;
 }
 
+void task_plot_destroy(struct graph_info *ginfo, struct graph_plot *plot)
+{
+        struct task_plot_info *task_info = plot->private;
+
+        free(task_info);
+}
+
 static const struct plot_callbacks task_plot_cb = {
         .match_time             = task_plot_match_time,
         .plot_event             = task_plot_event,
@@ -539,6 +546,7 @@ static const struct plot_callbacks task_plot_cb = {
         .display_last_event     = task_plot_display_last_event,
         .find_record            = task_plot_find_record,
         .display_info           = task_plot_display_info,
+        .destroy                = task_plot_destroy
 };
 
 void graph_plot_init_tasks(struct graph_info *ginfo)
diff --git a/trace-plot.c b/trace-plot.c
index 6531a5e..c6f7e7a 100644
--- a/trace-plot.c
+++ b/trace-plot.c
@@ -111,10 +111,11 @@ void trace_graph_plot_remove(struct graph_info *ginfo, struct graph_plot *plot)
         int pos = plot->pos;
         int i;
 
-        if (pos < 0 || pos >= ginfo->plots || !ginfo->plots)
-                return;
+        if (plot->cb->destroy)
+                plot->cb->destroy(ginfo, plot);
 
-        free(ginfo->plot_array[pos]);
+        free(plot->label);
+        free(plot);
 
         ginfo->plots--;