X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=gfio.c;h=7dcb18822db81516830fd2def5c0865be5190fb1;hb=2f122b135b7319ff8dd04dadf31ff28b301051a3;hp=eab02c251ab433303e4801ae455efe1df857dc62;hpb=a67909069393f090bb00c0039206bc30830f3427;p=fio.git diff --git a/gfio.c b/gfio.c index eab02c25..7dcb1882 100644 --- 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); @@ -158,6 +159,9 @@ struct gui_entry { GtkWidget *error_label; GtkWidget *results_notebook; GtkWidget *results_window; + GtkUIManager *results_uimanager; + GtkWidget *results_vbox; + GtkWidget *results_menu; GtkListStore *log_model; GtkWidget *log_tree; GtkWidget *log_view; @@ -168,89 +172,66 @@ struct gui_entry { gint page_num; unsigned int state; + struct graph *clat_graph; + struct graph *lat_bucket_graph; + struct gfio_client *client; int nr_job_files; char **job_files; }; +struct end_results { + struct group_run_stats gs; + struct thread_stat ts; +}; + struct gfio_client { struct gui_entry *ge; struct fio_client *client; GtkWidget *results_widget; - GtkWidget *disk_util_frame; + GtkWidget *disk_util_vbox; 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); static void gfio_update_thread_status_all(char *status_message, double perc); void report_error(GError *error); -static void iops_graph_y_axis_unit_change(struct graph *g, int power_of_ten) -{ - switch (power_of_ten) { - case 9: graph_y_title(g, "Billions of IOs / sec"); - break; - case 6: graph_y_title(g, "Millions of IOs / sec"); - break; - case 3: graph_y_title(g, "Thousands of IOs / sec"); - break; - case 0: - default: graph_y_title(g, "IOs / sec"); - break; - } -} - static struct graph *setup_iops_graph(void) { struct graph *g; g = graph_new(DRAWING_AREA_XDIM / 2.0, DRAWING_AREA_YDIM, gfio_graph_font); - graph_title(g, "IOPS"); + graph_title(g, "IOPS (IOs/sec)"); graph_x_title(g, "Time (secs)"); - graph_y_title(g, "IOs / sec"); graph_add_label(g, "Read IOPS"); graph_add_label(g, "Write IOPS"); graph_set_color(g, "Read IOPS", 0.13, 0.54, 0.13); graph_set_color(g, "Write IOPS", 1.0, 0.0, 0.0); line_graph_set_data_count_limit(g, gfio_graph_limit); - graph_y_axis_unit_change_notify(g, iops_graph_y_axis_unit_change); - graph_add_extra_space(g, 0.005, 0.005, 0.03, 0.03); + graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0); return g; } -static void bandwidth_graph_y_axis_unit_change(struct graph *g, int power_of_ten) -{ - switch (power_of_ten) { - case 9: graph_y_title(g, "Petabytes / sec"); - break; - case 6: graph_y_title(g, "Gigabytes / sec"); - break; - case 3: graph_y_title(g, "Megabytes / sec"); - break; - case 0: - default: graph_y_title(g, "Kilobytes / sec"); - break; - } -} - static struct graph *setup_bandwidth_graph(void) { struct graph *g; g = graph_new(DRAWING_AREA_XDIM / 2.0, DRAWING_AREA_YDIM, gfio_graph_font); - graph_title(g, "Bandwidth"); + graph_title(g, "Bandwidth (bytes/sec)"); graph_x_title(g, "Time (secs)"); - graph_y_title(g, "Kbytes / sec"); graph_add_label(g, "Read Bandwidth"); graph_add_label(g, "Write Bandwidth"); graph_set_color(g, "Read Bandwidth", 0.13, 0.54, 0.13); graph_set_color(g, "Write Bandwidth", 1.0, 0.0, 0.0); + graph_set_base_offset(g, 1); line_graph_set_data_count_limit(g, 100); - graph_y_axis_unit_change_notify(g, bandwidth_graph_y_axis_unit_change); - graph_add_extra_space(g, 0.005, 0.005, 0.03, 0.03); - + graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0); return g; } @@ -417,6 +398,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. @@ -425,7 +440,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: { @@ -485,22 +499,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); - /* - * So the below doesn't work at all, how to set those menu items - * invisibible... - */ - 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) @@ -579,6 +588,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, @@ -624,7 +656,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_lat_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_lat_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]; @@ -632,7 +695,8 @@ 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; + struct gui_entry *ge = gc->ge; char tmp[64]; len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv); @@ -651,14 +715,23 @@ 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); + 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_lat_drawing_area), ge->clat_graph); + g_signal_connect(G_OBJECT(drawing_area), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->clat_graph); gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3); out: @@ -707,7 +780,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" }; @@ -817,33 +891,42 @@ 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); free(bw_p); free(iops_p); } -static GtkWidget *gfio_output_lat_buckets(double *lat, unsigned int num, - const char **labels) +static struct graph *setup_lat_bucket_graph(const char *title, double *lat, + const char **labels, + 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, "Buckets"); + + for (i = 0; i < len; i++) { + graph_add_label(g, labels[i]); + graph_add_data(g, labels[i], lat[i]); + } + + return g; +} + +static GtkWidget *gfio_output_lat_buckets(double *lat, const char **labels, + int num) { GtkWidget *tree_view; GtkTreeSelection *selection; GtkListStore *model; GtkTreeIter iter; GType *types; - int i, skipped; - - /* - * Check if all are empty, in which case don't bother - */ - for (i = 0, skipped = 0; i < num; i++) - if (lat[i] <= 0.0) - skipped++; - - if (skipped == num) - return NULL; + int i; types = malloc(num * sizeof(GType)); @@ -882,39 +965,60 @@ static GtkWidget *gfio_output_lat_buckets(double *lat, unsigned int num, return tree_view; } -static void gfio_show_latency_buckets(GtkWidget *vbox, struct thread_stat *ts) +static void gfio_show_latency_buckets(struct gfio_client *gc, GtkWidget *vbox, + struct thread_stat *ts) { - GtkWidget *box, *frame, *tree_view; - double io_u_lat_u[FIO_IO_U_LAT_U_NR]; - double io_u_lat_m[FIO_IO_U_LAT_M_NR]; - const char *uranges[] = { "2", "4", "10", "20", "50", "100", - "250", "500", "750", "1000", }; - const char *mranges[] = { "2", "4", "10", "20", "50", "100", - "250", "500", "750", "1000", "2000", - ">= 2000", }; + double io_u_lat[FIO_IO_U_LAT_U_NR + FIO_IO_U_LAT_M_NR]; + const char *ranges[] = { "2u", "4u", "10u", "20u", "50u", "100u", + "250u", "500u", "750u", "1m", "2m", + "4m", "10m", "20m", "50m", "100m", + "250m", "500m", "750m", "1s", "2s", ">= 2s" }; + int start, end, i; + const int total = FIO_IO_U_LAT_U_NR + FIO_IO_U_LAT_M_NR; + GtkWidget *frame, *tree_view, *hbox, *completion_vbox, *drawing_area; + struct gui_entry *ge = gc->ge; - stat_calc_lat_u(ts, io_u_lat_u); - stat_calc_lat_m(ts, io_u_lat_m); + stat_calc_lat_u(ts, io_u_lat); + stat_calc_lat_m(ts, &io_u_lat[FIO_IO_U_LAT_U_NR]); - tree_view = gfio_output_lat_buckets(io_u_lat_u, FIO_IO_U_LAT_U_NR, uranges); - if (tree_view) { - frame = gtk_frame_new("Latency buckets (usec)"); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5); + /* + * Found out which first bucket has entries, and which last bucket + */ + start = end = -1U; + for (i = 0; i < total; i++) { + if (io_u_lat[i] == 0.00) + continue; - box = gtk_hbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(frame), box); - gtk_box_pack_start(GTK_BOX(box), tree_view, TRUE, FALSE, 3); + if (start == -1U) + start = i; + end = i; } - tree_view = gfio_output_lat_buckets(io_u_lat_m, FIO_IO_U_LAT_M_NR, mranges); - if (tree_view) { - frame = gtk_frame_new("Latency buckets (msec)"); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5); + /* + * No entries... + */ + if (start == -1U) + return; + + tree_view = gfio_output_lat_buckets(&io_u_lat[start], &ranges[start], end - start + 1); + ge->lat_bucket_graph = setup_lat_bucket_graph("Latency Buckets", &io_u_lat[start], &ranges[start], end - start + 1, 700.0, 300.0); - box = gtk_hbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(frame), box); - gtk_box_pack_start(GTK_BOX(box), tree_view, TRUE, FALSE, 3); - } + frame = gtk_frame_new("Latency buckets"); + 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(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_lat_drawing_area), ge->lat_bucket_graph); + g_signal_connect(G_OBJECT(drawing_area), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->lat_bucket_graph); + + gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3); } static void gfio_show_cpu_usage(GtkWidget *vbox, struct thread_stat *ts) @@ -1068,9 +1172,55 @@ static gboolean results_window_delete(GtkWidget *w, gpointer data) return TRUE; } +static void results_close(GtkWidget *w, gpointer *data) +{ + struct gui_entry *ge = (struct gui_entry *) data; + + gtk_widget_destroy(ge->results_window); +} + +static GtkActionEntry results_menu_items[] = { + { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, + { "GraphMenuAction", GTK_STOCK_FILE, "Graph", NULL, NULL, NULL}, + { "CloseFile", GTK_STOCK_CLOSE, "Close", "W", NULL, G_CALLBACK(results_close) }, +}; +static gint results_nmenu_items = sizeof(results_menu_items) / sizeof(results_menu_items[0]); + +static const gchar *results_ui_string = " \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +"; + +static GtkWidget *get_results_menubar(GtkWidget *window, struct gui_entry *ge) +{ + GtkActionGroup *action_group; + GtkWidget *widget; + GError *error = 0; + + ge->results_uimanager = gtk_ui_manager_new(); + + action_group = gtk_action_group_new("ResultsMenu"); + gtk_action_group_add_actions(action_group, results_menu_items, results_nmenu_items, ge); + + gtk_ui_manager_insert_action_group(ge->results_uimanager, action_group, 0); + gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ge->results_uimanager), results_ui_string, -1, &error); + + gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ge->results_uimanager)); + + widget = gtk_ui_manager_get_widget(ge->results_uimanager, "/MainMenu"); + return widget; +} + static GtkWidget *get_results_window(struct gui_entry *ge) { - GtkWidget *win, *notebook; + GtkWidget *win, *notebook, *vbox; if (ge->results_window) return ge->results_notebook; @@ -1081,25 +1231,38 @@ static GtkWidget *get_results_window(struct gui_entry *ge) g_signal_connect(win, "delete-event", G_CALLBACK(results_window_delete), ge); g_signal_connect(win, "destroy", G_CALLBACK(results_window_delete), ge); + vbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(win), vbox); + + ge->results_menu = get_results_menubar(win, ge); + gtk_box_pack_start(GTK_BOX(vbox), ge->results_menu, FALSE, FALSE, 0); + notebook = gtk_notebook_new(); gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), 1); gtk_notebook_popup_enable(GTK_NOTEBOOK(notebook)); - gtk_container_add(GTK_CONTAINER(win), notebook); + gtk_container_add(GTK_CONTAINER(vbox), notebook); ge->results_window = win; ge->results_notebook = notebook; 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); @@ -1112,7 +1275,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; @@ -1132,15 +1295,41 @@ 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_latency_buckets(gc, vbox, ts); gfio_show_cpu_usage(vbox, ts); gfio_show_io_depths(vbox, ts); +} - gtk_widget_show_all(gc->ge->results_window); +static void gfio_display_end_results(struct gfio_client *gc) +{ + struct gui_entry *ge = gc->ge; + GtkWidget *res_notebook; + int i; + + res_notebook = get_results_window(ge); + + for (i = 0; i < gc->nr_results; i++) { + struct end_results *e = &gc->results[i]; + + __gfio_display_end_results(res_notebook, gc, &e->ts, &e->gs); + } + + gtk_widget_show_all(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(); } @@ -1185,13 +1374,16 @@ static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd if (!gc->results_widget) goto out; - if (!gc->disk_util_frame) { - gc->disk_util_frame = gtk_frame_new("Disk utilization"); - gtk_box_pack_start(GTK_BOX(gc->results_widget), gc->disk_util_frame, FALSE, FALSE, 5); + if (!gc->disk_util_vbox) { + frame = gtk_frame_new("Disk utilization"); + gtk_box_pack_start(GTK_BOX(gc->results_widget), frame, FALSE, FALSE, 5); + vbox = gtk_vbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(frame), vbox); + gc->disk_util_vbox = vbox; } vbox = gtk_vbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(gc->disk_util_frame), vbox); + gtk_container_add(GTK_CONTAINER(gc->disk_util_vbox), vbox); frame = gtk_frame_new((char *) p->dus.name); gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2); @@ -1269,6 +1461,7 @@ static void gfio_thread_status_op(struct fio_client *client, sum_group_stats(&client_gs, &p->rs); client_ts.members++; + client_ts.thread_number = p->ts.thread_number; client_ts.groupid = p->ts.groupid; if (++sum_stat_nr == sum_stat_clients) { @@ -1579,7 +1772,7 @@ static void gfio_update_thread_status_all(char *status_message, double perc) gtk_widget_queue_draw(ui->window); } -static void gfio_quit_op(struct fio_client *client) +static void gfio_quit_op(struct fio_client *client, struct fio_net_cmd *cmd) { struct gfio_client *gc = client->client_data; @@ -1596,6 +1789,8 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) struct gui_entry *ge = gc->ge; char tmp[8]; + p->thread_number = le32_to_cpu(p->thread_number); + p->groupid = le32_to_cpu(p->groupid); convert_thread_options_to_cpu(o, &p->top); gdk_threads_enter(); @@ -1670,8 +1865,14 @@ static void gfio_client_job_start(struct fio_client *client, struct fio_net_cmd gdk_threads_leave(); } +static void gfio_client_iolog(struct fio_client *client, struct cmd_iolog_pdu *pdu) +{ + printf("got iolog: name=%s, type=%u, entries=%u\n", pdu->name, pdu->log_type, pdu->nr_samples); + free(pdu); +} + struct client_ops gfio_client_ops = { - .text_op = gfio_text_op, + .text = gfio_text_op, .disk_util = gfio_disk_util_op, .thread_status = gfio_thread_status_op, .group_stats = gfio_group_stats_op, @@ -1684,14 +1885,50 @@ struct client_ops gfio_client_ops = { .stop = gfio_client_stop, .start = gfio_client_start, .job_start = gfio_client_job_start, + .iolog = gfio_client_iolog, .eta_msec = FIO_CLIENT_DEF_ETA_MSEC, .stay_connected = 1, + .client_type = FIO_CLIENT_TYPE_GUI, }; +/* + * FIXME: need more handling here + */ +static void ge_destroy(struct gui_entry *ge) +{ + struct gfio_client *gc = ge->client; + + if (gc && gc->client) { + if (ge->state >= GE_STATE_CONNECTED) + fio_client_terminate(gc->client); + + fio_put_client(gc->client); + } + + flist_del(&ge->list); + free(ge); +} + +static void ge_widget_destroy(GtkWidget *w, gpointer data) +{ +} + +static void gfio_quit(struct gui *ui) +{ + struct gui_entry *ge; + + while (!flist_empty(&ui->list)) { + ge = flist_entry(ui->list.next, struct gui_entry, list); + ge_destroy(ge); + } + + gtk_main_quit(); +} + static void quit_clicked(__attribute__((unused)) GtkWidget *widget, __attribute__((unused)) gpointer data) { - gtk_main_quit(); + gfio_quit(data); } static void *job_thread(void *arg) @@ -1730,6 +1967,8 @@ static int send_job_files(struct gui_entry *ge) i++; } + free(ge->job_files); + ge->job_files = NULL; ge->nr_job_files = 0; return ret; } @@ -2039,25 +2278,6 @@ static struct gui_entry *alloc_new_gui_entry(struct gui *ui) return ge; } -/* - * FIXME: need more handling here - */ -static void ge_destroy(GtkWidget *w, gpointer data) -{ - struct gui_entry *ge = data; - struct gfio_client *gc = ge->client; - - if (gc && gc->client) { - if (ge->state >= GE_STATE_CONNECTED) - fio_client_terminate(gc->client); - - fio_put_client(gc->client); - } - - flist_del(&ge->list); - free(ge); -} - static struct gui_entry *get_new_ge_with_tab(const char *name) { struct gui_entry *ge; @@ -2065,7 +2285,7 @@ static struct gui_entry *get_new_ge_with_tab(const char *name) ge = alloc_new_gui_entry(&main_ui); ge->vbox = new_client_page(ge); - g_signal_connect(ge->vbox, "destroy", G_CALLBACK(ge_destroy), ge); + g_signal_connect(ge->vbox, "destroy", G_CALLBACK(ge_widget_destroy), ge); ge->page_label = gtk_label_new(name); ge->page_num = gtk_notebook_append_page(GTK_NOTEBOOK(main_ui.notebook), ge->vbox, ge->page_label); @@ -2144,12 +2364,21 @@ static void file_close(GtkWidget *w, gpointer data) return; } - gtk_main_quit(); + gfio_quit(ui); } static void file_add_recent(struct gui *ui, const gchar *uri) { - gtk_recent_manager_add_item(ui->recentmanager, uri); + GtkRecentData grd; + + memset(&grd, 0, sizeof(grd)); + grd.display_name = strdup("gfio"); + grd.description = strdup("Fio job file"); + grd.mime_type = strdup(GFIO_MIME); + grd.app_name = strdup(g_get_application_name()); + grd.app_exec = strdup("gfio %f/%u"); + + gtk_recent_manager_add_full(ui->recentmanager, uri, &grd); } static gchar *get_filename_from_uri(const gchar *uri) @@ -2385,6 +2614,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); @@ -2546,6 +2794,7 @@ static GtkActionEntry menu_items[] = { { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, { "Preferences", GTK_STOCK_PREFERENCES, NULL, "p", NULL, G_CALLBACK(preferences) }, { "ViewLog", NULL, "Log", "l", NULL, G_CALLBACK(view_log) }, + { "ViewResults", NULL, "Results", "R", NULL, G_CALLBACK(view_results) }, { "ConnectJob", NULL, "Connect", "E", NULL, G_CALLBACK(connect_job_entry) }, { "EditJob", NULL, "Edit job", "E", NULL, G_CALLBACK(edit_job_entry) }, { "SendJob", NULL, "Send job", "X", NULL, G_CALLBACK(send_job_entry) }, @@ -2580,6 +2829,8 @@ static const gchar *ui_string = " \ \ \ \ + \ + \ \ \ \ @@ -2589,18 +2840,10 @@ static const gchar *ui_string = " \ \ "; -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) { - GtkActionGroup *action_group = gtk_action_group_new("Menu"); + GtkActionGroup *action_group; GError *error = 0; action_group = gtk_action_group_new("Menu"); @@ -2645,7 +2888,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); @@ -2702,7 +2944,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); @@ -2747,7 +2988,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); @@ -2790,7 +3030,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); @@ -2838,6 +3077,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; } @@ -2976,9 +3216,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);