trace-view: Add ref counting of tracecmd_input handle

Have the TraceViewStore add its own reference to the tracecmd_input
handle, so that it may close it upon destruction of the model.

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

2 files changed, 7 insertions, 2 deletions

diff --git a/trace-view-main.c b/trace-view-main.c
index d98ddb7..a09ddb5 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -29,7 +29,6 @@ static void
 exit_clicked (GtkWidget *widget, gpointer data)
 {
         gtk_widget_destroy (GTK_WIDGET (data)); /* the user data points to the main window */
-        tracecmd_close(handle);
         gtk_main_quit ();
 }
 
@@ -38,7 +37,6 @@ static gint
 delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
         gtk_widget_destroy (widget); /* destroy the main window */
-        tracecmd_close(handle);
         gtk_main_quit ();
         return TRUE;
 }
@@ -256,6 +254,10 @@ void trace_view(int argc, char **argv)
         /* The tree needs its columns loaded now */
         trace_view_load(trace_tree, handle, spin);
 
+        /* Let the handle be freed when the trace_view is */
+        if (handle)
+                tracecmd_close(handle);
+
         label = gtk_label_new("      Search: ");
         gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
         gtk_widget_show(label);
diff --git a/trace-view-store.c b/trace-view-store.c
index a25c698..e81c1a2 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -216,6 +216,8 @@ trace_view_store_finalize (GObject *object)
                 store->spin = NULL;
         }
 
+        tracecmd_close(store->handle);
+
         /* must chain up - finalize parent */
         (* parent_class->finalize) (object);
 }
@@ -992,6 +994,7 @@ trace_view_store_new (struct tracecmd_input *handle)
 
         newstore->handle = handle;
         newstore->cpus = tracecmd_cpus(handle);
+        tracecmd_ref(handle);
 
         newstore->cpu_list = g_new(TraceViewRecord *, newstore->cpus);
         g_assert(newstore->cpu_list != NULL);