gfio: add View -> Results menu item
[fio.git] / gfio.c
diff --git a/gfio.c b/gfio.c
index e88c11b6301c63d4a87ceeed77b77d78eb3488b2..9837c1c8d3f2d79e7e209032bee69bea43f7bb6e 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -37,6 +37,7 @@
 static int gfio_server_running;
 static const char *gfio_graph_font;
 static unsigned int gfio_graph_limit = 100;
+static GdkColor white;
 
 static void view_log(GtkWidget *w, gpointer data);
 
@@ -174,6 +175,12 @@ struct gui_entry {
        struct gfio_client *client;
        int nr_job_files;
        char **job_files;
+       struct graph *clat_graph;
+};
+
+struct end_results {
+       struct group_run_stats gs;
+       struct thread_stat ts;
 };
 
 struct gfio_client {
@@ -184,6 +191,9 @@ struct gfio_client {
        GtkWidget *err_entry;
        unsigned int job_added;
        struct thread_options o;
+
+       struct end_results *results;
+       unsigned int nr_results;
 };
 
 static void gfio_update_thread_status(struct gui_entry *ge, char *status_message, double perc);
@@ -386,6 +396,40 @@ static void show_info_dialog(struct gui *ui, const char *title,
        gtk_widget_destroy(dialog);
 }
 
+static void set_menu_entry_text(struct gui *ui, const char *path,
+                               const char *text)
+{
+       GtkWidget *w;
+
+       w = gtk_ui_manager_get_widget(ui->uimanager, path);
+       if (w)
+               gtk_menu_item_set_label(GTK_MENU_ITEM(w), text);
+       else
+               fprintf(stderr, "gfio: can't find path %s\n", path);
+}
+
+
+static void set_menu_entry_visible(struct gui *ui, const char *path, int show)
+{
+       GtkWidget *w;
+
+       w = gtk_ui_manager_get_widget(ui->uimanager, path);
+       if (w)
+               gtk_widget_set_sensitive(w, show);
+       else
+               fprintf(stderr, "gfio: can't find path %s\n", path);
+}
+
+static void set_job_menu_visible(struct gui *ui, int visible)
+{
+       set_menu_entry_visible(ui, "/MainMenu/JobMenu", visible);
+}
+
+static void set_view_results_visible(struct gui *ui, int visible)
+{
+       set_menu_entry_visible(ui, "/MainMenu/ViewMenu/Results", visible);
+}
+
 /*
  * Update sensitivity of job buttons and job menu items, based on the
  * state of the client.
@@ -394,7 +438,6 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
 {
        unsigned int connect_state, send_state, start_state, edit_state;
        const char *connect_str = NULL;
-       GtkWidget *w;
 
        switch (ge->state) {
        default: {
@@ -454,18 +497,17 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
        gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], start_state);
        gtk_button_set_label(GTK_BUTTON(ge->button[CONNECT_BUTTON]), connect_str);
 
-       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Connect");
-       gtk_widget_set_sensitive(w, connect_state);
-       gtk_menu_item_set_label(GTK_MENU_ITEM(w), connect_str);
-
-       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Edit job");
-       gtk_widget_set_sensitive(w, edit_state);
+       set_menu_entry_visible(ui, "/MainMenu/JobMenu/Connect", connect_state);
+       set_menu_entry_text(ui, "/MainMenu/JobMenu/Connect", connect_str);
 
-       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Send job");
-       gtk_widget_set_sensitive(w, send_state);
+       set_menu_entry_visible(ui, "/MainMenu/JobMenu/Edit job", edit_state);
+       set_menu_entry_visible(ui, "/MainMenu/JobMenu/Send job", send_state);
+       set_menu_entry_visible(ui, "/MainMenu/JobMenu/Start job", start_state);
 
-       w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Start job");
-       gtk_widget_set_sensitive(w, start_state);
+       if (ge->client && ge->client->nr_results)
+               set_view_results_visible(ui, 1);
+       else
+               set_view_results_visible(ui, 0);
 }
 
 static void gfio_set_state(struct gui_entry *ge, unsigned int state)
@@ -544,6 +586,29 @@ static void gfio_ui_setup_log(struct gui *ui)
        ui->log_tree = tree_view;
 }
 
+static struct graph *setup_clat_graph(char *title, unsigned int *ovals,
+                                     fio_fp64_t *plist,
+                                     unsigned int len,
+                                     double xdim, double ydim)
+{
+       struct graph *g;
+       int i;
+
+       g = graph_new(xdim, ydim, gfio_graph_font);
+       graph_title(g, title);
+       graph_x_title(g, "Percentile");
+
+       for (i = 0; i < len; i++) {
+               char fbuf[8];
+
+               sprintf(fbuf, "%2.2f%%", plist[i].u.f);
+               graph_add_label(g, fbuf);
+               graph_add_data(g, fbuf, (double) ovals[i]);
+       }
+
+       return g;
+}
+
 static GtkWidget *gfio_output_clat_percentiles(unsigned int *ovals,
                                               fio_fp64_t *plist,
                                               unsigned int len,
@@ -589,7 +654,38 @@ static GtkWidget *gfio_output_clat_percentiles(unsigned int *ovals,
        return tree_view;
 }
 
-static void gfio_show_clat_percentiles(GtkWidget *vbox, struct thread_stat *ts,
+static int on_expose_clat_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p)
+{
+       struct graph *g = p;
+       cairo_t *cr;
+
+       cr = gdk_cairo_create(w->window);
+#if 0
+       if (graph_has_tooltips(g)) {
+               g_object_set(w, "has-tooltip", TRUE, NULL);
+               g_signal_connect(w, "query-tooltip", G_CALLBACK(clat_graph_tooltip), g);
+       }
+#endif
+       cairo_set_source_rgb(cr, 0, 0, 0);
+       bar_graph_draw(g, cr);
+       cairo_destroy(cr);
+
+       return FALSE;
+}
+
+static gint on_config_clat_drawing_area(GtkWidget *w, GdkEventConfigure *event,
+                                  gpointer data)
+{
+       struct graph *g = data;
+
+       graph_set_size(g, w->allocation.width, w->allocation.height);
+       graph_set_size(g, w->allocation.width, w->allocation.height);
+       graph_set_position(g, 0, 0);
+       return TRUE;
+}
+
+static void gfio_show_clat_percentiles(struct gfio_client *gc,
+                                      GtkWidget *vbox, struct thread_stat *ts,
                                       int ddir)
 {
        unsigned int *io_u_plat = ts->io_u_plat[ddir];
@@ -597,7 +693,7 @@ static void gfio_show_clat_percentiles(GtkWidget *vbox, struct thread_stat *ts,
        fio_fp64_t *plist = ts->percentile_list;
        unsigned int *ovals, len, minv, maxv, scale_down;
        const char *base;
-       GtkWidget *tree_view, *frame, *hbox;
+       GtkWidget *tree_view, *frame, *hbox, *drawing_area, *completion_vbox;
        char tmp[64];
 
        len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
@@ -616,14 +712,25 @@ static void gfio_show_clat_percentiles(GtkWidget *vbox, struct thread_stat *ts,
                base = "usec";
        }
 
+       sprintf(tmp, "Completion percentiles (%s)", base);
        tree_view = gfio_output_clat_percentiles(ovals, plist, len, base, scale_down);
+       gc->ge->clat_graph = setup_clat_graph(tmp, ovals, plist, len, 700.0, 300.0);
 
-       sprintf(tmp, "Completion percentiles (%s)", base);
        frame = gtk_frame_new(tmp);
        gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
 
+       completion_vbox = gtk_vbox_new(FALSE, 3);
+       gtk_container_add(GTK_CONTAINER(frame), completion_vbox);
        hbox = gtk_hbox_new(FALSE, 3);
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       gtk_container_add(GTK_CONTAINER(completion_vbox), hbox);
+       drawing_area = gtk_drawing_area_new();
+       gtk_widget_set_size_request(GTK_WIDGET(drawing_area), 700, 300);
+       gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &white);
+       gtk_container_add(GTK_CONTAINER(completion_vbox), drawing_area);
+       g_signal_connect(G_OBJECT(drawing_area), "expose_event",
+                               G_CALLBACK(on_expose_clat_drawing_area), gc->ge->clat_graph);
+       g_signal_connect(G_OBJECT(drawing_area), "configure_event",
+                               G_CALLBACK(on_config_clat_drawing_area), gc->ge->clat_graph);
 
        gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
 out:
@@ -672,7 +779,8 @@ static void gfio_show_lat(GtkWidget *vbox, const char *name, unsigned long min,
 #define GFIO_SLAT      2
 #define GFIO_LAT       4
 
-static void gfio_show_ddir_status(GtkWidget *mbox, struct group_run_stats *rs,
+static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox,
+                                 struct group_run_stats *rs,
                                  struct thread_stat *ts, int ddir)
 {
        const char *ddir_label[2] = { "Read", "Write" };
@@ -782,7 +890,7 @@ static void gfio_show_ddir_status(GtkWidget *mbox, struct group_run_stats *rs,
        }
 
        if (ts->clat_percentiles)
-               gfio_show_clat_percentiles(main_vbox, ts, ddir);
+               gfio_show_clat_percentiles(gc, main_vbox, ts, ddir);
 
 
        free(io_p);
@@ -1108,15 +1216,22 @@ static GtkWidget *get_results_window(struct gui_entry *ge)
        return ge->results_notebook;
 }
 
-static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
-                           struct group_run_stats *rs)
+static void gfio_add_end_results(struct gfio_client *gc, struct thread_stat *ts,
+                                struct group_run_stats *rs)
 {
-       GtkWidget *res_win, *box, *vbox, *entry, *scroll;
-       struct gfio_client *gc = client->client_data;
+       unsigned int nr = gc->nr_results;
 
-       gdk_threads_enter();
+       gc->results = realloc(gc->results, (nr + 1) * sizeof(struct end_results));
+       memcpy(&gc->results[nr].ts, ts, sizeof(*ts));
+       memcpy(&gc->results[nr].gs, rs, sizeof(*rs));
+       gc->nr_results++;
+}
 
-       res_win = get_results_window(gc->ge);
+static void __gfio_display_end_results(GtkWidget *win, struct gfio_client *gc,
+                                      struct thread_stat *ts,
+                                      struct group_run_stats *rs)
+{
+       GtkWidget *box, *vbox, *entry, *scroll;
 
        scroll = gtk_scrolled_window_new(NULL, NULL);
        gtk_container_set_border_width(GTK_CONTAINER(scroll), 5);
@@ -1129,7 +1244,7 @@ static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
 
        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox);
 
-       gtk_notebook_append_page(GTK_NOTEBOOK(res_win), scroll, gtk_label_new(ts->name));
+       gtk_notebook_append_page(GTK_NOTEBOOK(win), scroll, gtk_label_new(ts->name));
 
        gc->results_widget = vbox;
 
@@ -1149,15 +1264,40 @@ static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
        entry_set_int_value(entry, ts->pid);
 
        if (ts->io_bytes[DDIR_READ])
-               gfio_show_ddir_status(vbox, rs, ts, DDIR_READ);
+               gfio_show_ddir_status(gc, vbox, rs, ts, DDIR_READ);
        if (ts->io_bytes[DDIR_WRITE])
-               gfio_show_ddir_status(vbox, rs, ts, DDIR_WRITE);
+               gfio_show_ddir_status(gc, vbox, rs, ts, DDIR_WRITE);
 
        gfio_show_latency_buckets(vbox, ts);
        gfio_show_cpu_usage(vbox, ts);
        gfio_show_io_depths(vbox, ts);
+}
+
+static void gfio_display_end_results(struct gfio_client *gc)
+{
+       GtkWidget *res_win;
+       int i;
+
+       res_win = get_results_window(gc->ge);
+
+       for (i = 0; i < gc->nr_results; i++) {
+               struct end_results *e = &gc->results[i];
+
+               __gfio_display_end_results(res_win, gc, &e->ts, &e->gs);
+       }
 
        gtk_widget_show_all(gc->ge->results_window);
+}
+
+static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
+                           struct group_run_stats *rs)
+{
+       struct gfio_client *gc = client->client_data;
+
+       gfio_add_end_results(gc, ts, rs);
+
+       gdk_threads_enter();
+       gfio_display_end_results(gc);
        gdk_threads_leave();
 }
 
@@ -1689,7 +1829,7 @@ static void gfio_client_job_start(struct fio_client *client, struct fio_net_cmd
 
 static void gfio_client_iolog(struct fio_client *client, struct cmd_iolog_pdu *pdu)
 {
-       printf("got iolog: type=%u, entries=%u\n", pdu->log_type, pdu->nr_samples);
+       printf("got iolog: name=%s, type=%u, entries=%u\n", pdu->name, pdu->log_type, pdu->nr_samples);
        free(pdu);
 }
 
@@ -2436,6 +2576,25 @@ static void start_job_entry(GtkWidget *w, gpointer data)
                start_job_clicked(w, ge);
 }
 
+static void view_results(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+       struct gfio_client *gc;
+       struct gui_entry *ge;
+
+       ge = get_ge_from_cur_tab(ui);
+       if (!ge)
+               return;
+
+       if (ge->results_window)
+               return;
+
+       gc = ge->client;
+       if (gc && gc->nr_results)
+               gfio_display_end_results(gc);
+}
+
+
 static void __update_graph_limits(struct gfio_graphs *g)
 {
        line_graph_set_data_count_limit(g->iops_graph, gfio_graph_limit);
@@ -2597,6 +2756,7 @@ static GtkActionEntry menu_items[] = {
        { "SaveFile", GTK_STOCK_SAVE, NULL,   "<Control>S", NULL, G_CALLBACK(file_save) },
        { "Preferences", GTK_STOCK_PREFERENCES, NULL, "<Control>p", NULL, G_CALLBACK(preferences) },
        { "ViewLog", NULL, "Log", "<Control>l", NULL, G_CALLBACK(view_log) },
+       { "ViewResults", NULL, "Results", "<Control>R", NULL, G_CALLBACK(view_results) },
        { "ConnectJob", NULL, "Connect", "<Control>E", NULL, G_CALLBACK(connect_job_entry) },
        { "EditJob", NULL, "Edit job", "<Control>E", NULL, G_CALLBACK(edit_job_entry) },
        { "SendJob", NULL, "Send job", "<Control>X", NULL, G_CALLBACK(send_job_entry) },
@@ -2631,6 +2791,8 @@ static const gchar *ui_string = " \
                                <menuitem name=\"Start job\" action=\"StartJob\" /> \
                        </menu>\
                        <menu name=\"ViewMenu\" action=\"ViewMenuAction\"> \
+                               <menuitem name=\"Results\" action=\"ViewResults\" /> \
+                               <separator name=\"Separator7\"/> \
                                <menuitem name=\"Log\" action=\"ViewLog\" /> \
                        </menu>\
                        <menu name=\"Help\" action=\"HelpMenuAction\"> \
@@ -2640,14 +2802,6 @@ static const gchar *ui_string = " \
        </ui> \
 ";
 
-static void set_job_menu_visible(struct gui *ui, int visible)
-{
-       GtkWidget *job;
-
-       job = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu");
-       gtk_widget_set_sensitive(job, visible);
-}
-
 static GtkWidget *get_menubar_menu(GtkWidget *window, GtkUIManager *ui_manager,
                                   struct gui *ui)
 {
@@ -2696,7 +2850,6 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
 {
        GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
        GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
-       GdkColor white;
 
        main_vbox = gtk_vbox_new(FALSE, 3);
 
@@ -2753,7 +2906,6 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
        /*
         * Set up a drawing area and IOPS and bandwidth graphs
         */
-       gdk_color_parse("white", &white);
        ge->graphs.drawing_area = gtk_drawing_area_new();
        gtk_widget_set_size_request(GTK_WIDGET(ge->graphs.drawing_area),
                DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
@@ -2798,7 +2950,6 @@ static GtkWidget *new_main_page(struct gui *ui)
 {
        GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
        GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
-       GdkColor white;
 
        main_vbox = gtk_vbox_new(FALSE, 3);
 
@@ -2841,7 +2992,6 @@ static GtkWidget *new_main_page(struct gui *ui)
        /*
         * Set up a drawing area and IOPS and bandwidth graphs
         */
-       gdk_color_parse("white", &white);
        ui->graphs.drawing_area = gtk_drawing_area_new();
        gtk_widget_set_size_request(GTK_WIDGET(ui->graphs.drawing_area),
                DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
@@ -2889,6 +3039,7 @@ static gboolean notebook_switch_page(GtkNotebook *notebook, GtkWidget *widget,
 
        if (!page) {
                set_job_menu_visible(ui, 0);
+               set_view_results_visible(ui, 0);
                return TRUE;
        }
 
@@ -3027,9 +3178,10 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
        settings = gtk_settings_get_default();
        gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "gfio setting");
        g_type_init();
+       gdk_color_parse("white", &white);
        
        ui->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_title(GTK_WINDOW(ui->window), "fio");
+       gtk_window_set_title(GTK_WINDOW(ui->window), "fio");
        gtk_window_set_default_size(GTK_WINDOW(ui->window), 1024, 768);
 
        g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), NULL);