6 files changed, 33 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 9975f2f..0f65858 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ trace-view-main.o::	$(HEADERS) trace-view-store.h trace-view.h
 trace-filter.o::        $(HEADERS)
 trace-graph.o::         $(HEADERS) trace-graph.h
 trace-graph-main.o::    $(HEADERS) trace-graph.h
-kernel-shark.o::        $(HEADERS)
+kernel-shark.o::        $(HEADERS) kernel-shark.h
 
 TRACE_VIEW_OBJS = trace-view.o trace-view-store.o trace-filter.o
 
diff --git a/kernel-shark.c b/kernel-shark.c
index e40304a..d1952ba 100644
--- a/kernel-shark.c
+++ b/kernel-shark.c
@@ -74,9 +74,12 @@ static void ks_graph_select(struct graph_info *ginfo, guint64 cursor)
 
 /* Callback for the clicked signal of the Exit button */
 static void
-exit_clicked (GtkWidget *widget, gpointer data)
+exit_clicked (gpointer data)
 {
-        gtk_widget_destroy (GTK_WIDGET (data)); /* the user data points to the main window */
+        struct shark_info *info = data;
+
+        gtk_widget_destroy (info->window); /* the user data points to the main window */
+        tracecmd_close(info->handle);
         gtk_main_quit ();
 }
 
@@ -84,7 +87,10 @@ exit_clicked (GtkWidget *widget, gpointer data)
 static gint
 delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
+        struct shark_info *info = data;
+
         gtk_widget_destroy (widget); /* destroy the main window */
+        tracecmd_close(info->handle);
         gtk_main_quit ();
         return TRUE;
 }
@@ -128,9 +134,9 @@ void kernel_shark(int argc, char **argv)
                 die("Unable to allocate info");
 
         handle = tracecmd_open(input_file);
-
         if (!handle)
                 die("error reading header");
+        info->handle = handle;
 
         if (tracecmd_read_headers(handle) < 0)
                 return;
@@ -143,6 +149,7 @@ void kernel_shark(int argc, char **argv)
         /* --- Main window --- */
 
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+        info->window = window;
 
         /* --- Top Level Vbox --- */
 
@@ -176,7 +183,7 @@ void kernel_shark(int argc, char **argv)
         /* We can attach the Quit menu item to our exit function */
         g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
                                   G_CALLBACK (exit_clicked),
-                                  (gpointer) window);
+                                  (gpointer) info);
 
         /* We do need to show menu items */
         gtk_widget_show(sub_item);
@@ -308,7 +315,7 @@ void kernel_shark(int argc, char **argv)
 
         gtk_signal_connect (GTK_OBJECT (window), "delete_event",
                             (GtkSignalFunc) delete_event,
-                            NULL);
+                            (gpointer) info);
 
         gtk_widget_set_size_request(window, TRACE_WIDTH, TRACE_HEIGHT);
 
diff --git a/kernel-shark.h b/kernel-shark.h
index 3433901..bf9e632 100644
--- a/kernel-shark.h
+++ b/kernel-shark.h
@@ -5,9 +5,11 @@
 #include "trace-view.h"
 
 struct shark_info {
-        struct graph_info       *ginfo;
-        GtkWidget               *treeview;
-        struct graph_callbacks  graph_cbs;
+        GtkWidget                       *window;
+        struct graph_info               *ginfo;
+        struct tracecmd_input           *handle;
+        GtkWidget                       *treeview;
+        struct graph_callbacks          graph_cbs;
 };
 
 #define offset_of(type, field)          (long)(&((type *)0)->field)
diff --git a/trace-graph-main.c b/trace-graph-main.c
index d192f63..4eb257f 100644
--- a/trace-graph-main.c
+++ b/trace-graph-main.c
@@ -9,12 +9,14 @@
 #define TRACE_HEIGHT    600
 #define input_file "trace.dat"
 
+static struct graph_info *ginfo;
 
 /* Callback for the clicked signal of the Exit button */
 static void
 exit_clicked (GtkWidget *widget, gpointer data)
 {
         gtk_widget_destroy (GTK_WIDGET (data)); /* the user data points to the main window */
+        tracecmd_close(ginfo->handle);
         gtk_main_quit ();
 }
 
@@ -23,6 +25,7 @@ static gint
 delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
         gtk_widget_destroy (widget); /* destroy the main window */
+        tracecmd_close(ginfo->handle);
         gtk_main_quit ();
         return TRUE;
 }
@@ -30,7 +33,6 @@ delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
 void trace_graph(int argc, char **argv)
 {
         struct tracecmd_input *handle;
-        struct graph_info *ginfo;
         GtkWidget *window;
         GtkWidget *vbox;
         GtkWidget *hbox;
diff --git a/trace-view-main.c b/trace-view-main.c
index bf01543..c0eb716 100644
--- a/trace-view-main.c
+++ b/trace-view-main.c
@@ -10,12 +10,14 @@
 #define input_file "trace.dat"
 
 GtkWidget *trace_tree;
+static struct tracecmd_input *handle;
 
 /* Callback for the clicked signal of the Exit button */
 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 ();
 }
 
@@ -24,6 +26,7 @@ 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;
 }
@@ -63,7 +66,6 @@ create_combo_box_model(void)
 
 void trace_view(int argc, char **argv)
 {
-        struct tracecmd_input *handle;
         GtkWidget *window;
         GtkWidget *vbox;
         GtkWidget *hbox;
diff --git a/trace-view-store.c b/trace-view-store.c
index 6ee5e46..85c36e0 100644
--- a/trace-view-store.c
+++ b/trace-view-store.c
@@ -206,9 +206,17 @@ static void
 trace_view_store_finalize (GObject *object)
 {
         TraceViewStore *store = TRACE_VIEW_STORE(object);
+        gint cpu;
 
         /* free all records and free all memory used by the list */
-#warning IMPLEMENT
+
+        for (cpu = 0; cpu < store->cpus; cpu++)
+                g_free(store->cpu_list[cpu]);
+
+        g_free(store->cpu_list);
+        g_free(store->cpu_mask);
+        g_free(store->rows);
+        g_free(store->cpu_items);
 
         if (store->spin) {
                 gtk_widget_destroy(store->spin);