gfio: kill ge on widget destroy

[fio.git] / gfio.c

diff --git a/gfio.c b/gfio.c
index 15fce1df96a1afd5a52ab0181885776b5a284afd..b1e9b5f75ac234af1c7ea59bf9ce77b2669a5439 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -347,6 +347,7 @@ static struct graph *setup_clat_graph(char *title, unsigned int *ovals,
        g = graph_new(xdim, ydim, gfio_graph_font);
        graph_title(g, title);
        graph_x_title(g, "Percentile");
+       graph_y_title(g, "Time");
 
        for (i = 0; i < len; i++) {
                char fbuf[8];
@@ -657,6 +658,7 @@ static struct graph *setup_lat_bucket_graph(const char *title, double *lat,
        g = graph_new(xdim, ydim, gfio_graph_font);
        graph_title(g, title);
        graph_x_title(g, "Buckets");
+       graph_y_title(g, "Percent");
 
        for (i = 0; i < len; i++) {
                graph_add_label(g, labels[i]);
@@ -1024,7 +1026,7 @@ static GtkWidget *gfio_disk_util_get_vbox(struct gui_entry *ge)
        scroll = get_scrolled_window(5);
        vbox = gtk_vbox_new(FALSE, 3);
        box = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), box, TRUE, FALSE, 5);
+       gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5);
 
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox);
        res_notebook = get_results_window(ge);
@@ -1744,6 +1746,9 @@ static void ge_destroy(struct gui_entry *ge)
 
 static void ge_widget_destroy(GtkWidget *w, gpointer data)
 {
+       struct gui_entry *ge = (struct gui_entry *) data;
+
+       ge_destroy(ge);
 }
 
 static void gfio_quit(struct gui *ui)
@@ -1761,7 +1766,7 @@ static void gfio_quit(struct gui *ui)
 static void quit_clicked(__attribute__((unused)) GtkWidget *widget,
                 __attribute__((unused)) gpointer data)
 {
-       gfio_quit(data);
+       gfio_quit(&main_ui);
 }
 
 static void *job_thread(void *arg)
@@ -2068,6 +2073,7 @@ static void gfio_client_added(struct gui_entry *ge, struct fio_client *client)
 
        gc = malloc(sizeof(*gc));
        memset(gc, 0, sizeof(*gc));
+       options_default_fill(&gc->o);
        gc->ge = ge;
        gc->client = fio_get_client(client);