X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=c67e49242e0493e0e88f569a6c6ff80545c5a953;hp=f5df1bb1391c63f85586ca837fb610accb39e82e;hb=99d633af3611958ea6217f270677d0a657e4dddc;hpb=38634cb19ddc5576b6e96a30fd6c444082e93501 diff --git a/gfio.c b/gfio.c index f5df1bb1..c67e4924 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); @@ -51,16 +52,16 @@ static void send_clicked(GtkWidget *widget, gpointer data); static struct button_spec { const char *buttontext; clickfunction f; - const char *tooltiptext; - const int start_insensitive; + const char *tooltiptext[2]; + const int start_sensitive; } buttonspeclist[] = { #define CONNECT_BUTTON 0 #define SEND_BUTTON 1 #define START_JOB_BUTTON 2 - { "Connect", connect_clicked, "Connect to host", 0 }, - { "Send", send_clicked, "Send job description to host", 1 }, + { "Connect", connect_clicked, { "Disconnect from host", "Connect to host" }, 1 }, + { "Send", send_clicked, { "Send job description to host", NULL }, 0 }, { "Start Job", start_job_clicked, - "Start the current job on the server", 1 }, + { "Start the current job on the server", NULL }, 0 }, }; struct probe_widget { @@ -80,6 +81,7 @@ struct multitext_widget { struct eta_widget { GtkWidget *names; struct multitext_widget iotype; + struct multitext_widget bs; struct multitext_widget ioengine; struct multitext_widget iodepth; GtkWidget *jobs; @@ -156,8 +158,11 @@ struct gui_entry { GtkWidget *notebook; GtkWidget *error_info_bar; GtkWidget *error_label; - GtkWidget *results_notebook; GtkWidget *results_window; + GtkWidget *results_notebook; + GtkUIManager *results_uimanager; + GtkWidget *results_menu; + GtkWidget *disk_util_vbox; GtkListStore *log_model; GtkWidget *log_tree; GtkWidget *log_view; @@ -168,89 +173,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 *err_entry; - unsigned int job_added; struct thread_options o; + + struct end_results *results; + unsigned int nr_results; + + struct cmd_du_pdu *du; + unsigned int nr_du; }; 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; } @@ -319,6 +301,7 @@ static void clear_ge_ui_info(struct gui_entry *ge) gtk_entry_set_text(GTK_ENTRY(ge->eta.name), ""); #endif multitext_update_entry(&ge->eta.iotype, 0, ""); + multitext_update_entry(&ge->eta.bs, 0, ""); multitext_update_entry(&ge->eta.ioengine, 0, ""); multitext_update_entry(&ge->eta.iodepth, 0, ""); gtk_entry_set_text(GTK_ENTRY(ge->eta.jobs), ""); @@ -417,6 +400,73 @@ 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); +} + +static const char *get_button_tooltip(struct button_spec *s, int sensitive) +{ + if (s->tooltiptext[sensitive]) + return s->tooltiptext[sensitive]; + + return s->tooltiptext[0]; +} + +static GtkWidget *add_button(GtkWidget *buttonbox, + struct button_spec *buttonspec, gpointer data) +{ + GtkWidget *button = gtk_button_new_with_label(buttonspec->buttontext); + gboolean sens = buttonspec->start_sensitive; + + g_signal_connect(button, "clicked", G_CALLBACK(buttonspec->f), data); + gtk_box_pack_start(GTK_BOX(buttonbox), button, FALSE, FALSE, 3); + + sens = buttonspec->start_sensitive; + gtk_widget_set_tooltip_text(button, get_button_tooltip(buttonspec, sens)); + gtk_widget_set_sensitive(button, sens); + + return button; +} + +static void add_buttons(struct gui_entry *ge, struct button_spec *buttonlist, + int nbuttons) +{ + int i; + + for (i = 0; i < nbuttons; i++) + ge->button[i] = add_button(ge->buttonbox, &buttonlist[i], ge); +} + /* * Update sensitivity of job buttons and job menu items, based on the * state of the client. @@ -425,7 +475,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: { @@ -484,23 +533,19 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge) gtk_widget_set_sensitive(ge->button[SEND_BUTTON], send_state); gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], start_state); gtk_button_set_label(GTK_BUTTON(ge->button[CONNECT_BUTTON]), connect_str); + gtk_widget_set_tooltip_text(ge->button[CONNECT_BUTTON], get_button_tooltip(&buttonspeclist[CONNECT_BUTTON], connect_state)); - /* - * 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 +624,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 +692,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 +731,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 +751,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 +816,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 +927,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 +1001,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 +1208,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 +1267,168 @@ 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 disk_util_destroy(GtkWidget *w, gpointer data) { - GtkWidget *res_win, *box, *vbox, *entry, *scroll; - struct gfio_client *gc = client->client_data; + struct gui_entry *ge = (struct gui_entry *) data; - gdk_threads_enter(); + ge->disk_util_vbox = NULL; + gtk_widget_destroy(w); +} - res_win = get_results_window(gc->ge); +static GtkWidget *get_scrolled_window(gint border_width) +{ + GtkWidget *scroll; + + scroll = gtk_scrolled_window_new(NULL, NULL); + gtk_container_set_border_width(GTK_CONTAINER(scroll), border_width); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + return scroll; +} + +static GtkWidget *gfio_disk_util_get_vbox(struct gui_entry *ge) +{ + GtkWidget *vbox, *box, *scroll, *res_notebook; + + if (ge->disk_util_vbox) + return ge->disk_util_vbox; + + 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_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox); + res_notebook = get_results_window(ge); + + gtk_notebook_append_page(GTK_NOTEBOOK(res_notebook), scroll, gtk_label_new("Disk utilization")); + ge->disk_util_vbox = box; + g_signal_connect(vbox, "destroy", G_CALLBACK(disk_util_destroy), ge); + + return ge->disk_util_vbox; +} + +static int __gfio_disk_util_show(GtkWidget *res_notebook, + struct gfio_client *gc, struct cmd_du_pdu *p) +{ + GtkWidget *box, *frame, *entry, *vbox, *util_vbox; + struct gui_entry *ge = gc->ge; + double util; + char tmp[16]; + + util_vbox = gfio_disk_util_get_vbox(ge); + + vbox = gtk_vbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(util_vbox), vbox); + + frame = gtk_frame_new((char *) p->dus.name); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2); + + box = gtk_vbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(frame), box); + + frame = gtk_frame_new("Read"); + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2); + vbox = gtk_hbox_new(TRUE, 3); + gtk_container_add(GTK_CONTAINER(frame), vbox); + entry = new_info_entry_in_frame(vbox, "IOs"); + entry_set_int_value(entry, p->dus.ios[0]); + entry = new_info_entry_in_frame(vbox, "Merges"); + entry_set_int_value(entry, p->dus.merges[0]); + entry = new_info_entry_in_frame(vbox, "Sectors"); + entry_set_int_value(entry, p->dus.sectors[0]); + entry = new_info_entry_in_frame(vbox, "Ticks"); + entry_set_int_value(entry, p->dus.ticks[0]); + + frame = gtk_frame_new("Write"); + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2); + vbox = gtk_hbox_new(TRUE, 3); + gtk_container_add(GTK_CONTAINER(frame), vbox); + entry = new_info_entry_in_frame(vbox, "IOs"); + entry_set_int_value(entry, p->dus.ios[1]); + entry = new_info_entry_in_frame(vbox, "Merges"); + entry_set_int_value(entry, p->dus.merges[1]); + entry = new_info_entry_in_frame(vbox, "Sectors"); + entry_set_int_value(entry, p->dus.sectors[1]); + entry = new_info_entry_in_frame(vbox, "Ticks"); + entry_set_int_value(entry, p->dus.ticks[1]); + + frame = gtk_frame_new("Shared"); + gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2); + vbox = gtk_hbox_new(TRUE, 3); + gtk_container_add(GTK_CONTAINER(frame), vbox); + entry = new_info_entry_in_frame(vbox, "IO ticks"); + entry_set_int_value(entry, p->dus.io_ticks); + entry = new_info_entry_in_frame(vbox, "Time in queue"); + entry_set_int_value(entry, p->dus.time_in_queue); + + util = 0.0; + if (p->dus.msec) + util = (double) 100 * p->dus.io_ticks / (double) p->dus.msec; + if (util > 100.0) + util = 100.0; + + sprintf(tmp, "%3.2f%%", util); + entry = new_info_entry_in_frame(vbox, "Disk utilization"); + gtk_entry_set_text(GTK_ENTRY(entry), tmp); + + gtk_widget_show_all(ge->results_window); + return 0; +} + +static int gfio_disk_util_show(struct gfio_client *gc) +{ + struct gui_entry *ge = gc->ge; + GtkWidget *res_notebook; + int i; + + if (!gc->nr_du) + return 1; + + res_notebook = get_results_window(ge); + + for (i = 0; i < gc->nr_du; i++) { + struct cmd_du_pdu *p = &gc->du[i]; + + __gfio_disk_util_show(res_notebook, gc, p); + } + + gtk_widget_show_all(ge->results_window); + return 0; +} + +static void gfio_add_end_results(struct gfio_client *gc, struct thread_stat *ts, + struct group_run_stats *rs) +{ + unsigned int nr = gc->nr_results; + + 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++; +} + +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,9 +1441,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)); - - gc->results_widget = vbox; + gtk_notebook_append_page(GTK_NOTEBOOK(win), scroll, gtk_label_new(ts->name)); entry = new_info_entry_in_frame(box, "Name"); gtk_entry_set_text(GTK_ENTRY(entry), ts->name); @@ -1132,15 +1459,46 @@ 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); +} + +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); + } + + if (gfio_disk_util_show(gc)) + gtk_widget_show_all(ge->results_window); +} - 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; + struct gui_entry *ge = gc->ge; + + gfio_add_end_results(gc, ts, rs); + + gdk_threads_enter(); + if (ge->results_window) + __gfio_display_end_results(ge->results_notebook, gc, ts, rs); + else + gfio_display_end_results(gc); gdk_threads_leave(); } @@ -1161,91 +1519,33 @@ static void gfio_text_op(struct fio_client *client, struct fio_net_cmd *cmd) gdk_threads_enter(); gtk_list_store_append(ui->log_model, &iter); - gtk_list_store_set(ui->log_model, &iter, 0, timebuf, -1); - gtk_list_store_set(ui->log_model, &iter, 1, client->hostname, -1); - gtk_list_store_set(ui->log_model, &iter, 2, p->level, -1); - gtk_list_store_set(ui->log_model, &iter, 3, p->buf, -1); - - if (p->level == FIO_LOG_ERR) - view_log(NULL, (gpointer) ui); - - gdk_threads_leave(); -} - -static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd) -{ - struct cmd_du_pdu *p = (struct cmd_du_pdu *) cmd->payload; - struct gfio_client *gc = client->client_data; - GtkWidget *box, *frame, *entry, *vbox; - double util; - char tmp[16]; - - gdk_threads_enter(); - - 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); - } - - vbox = gtk_vbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(gc->disk_util_frame), vbox); - - frame = gtk_frame_new((char *) p->dus.name); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2); - - box = gtk_vbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(frame), box); - - frame = gtk_frame_new("Read"); - gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2); - vbox = gtk_hbox_new(TRUE, 3); - gtk_container_add(GTK_CONTAINER(frame), vbox); - entry = new_info_entry_in_frame(vbox, "IOs"); - entry_set_int_value(entry, p->dus.ios[0]); - entry = new_info_entry_in_frame(vbox, "Merges"); - entry_set_int_value(entry, p->dus.merges[0]); - entry = new_info_entry_in_frame(vbox, "Sectors"); - entry_set_int_value(entry, p->dus.sectors[0]); - entry = new_info_entry_in_frame(vbox, "Ticks"); - entry_set_int_value(entry, p->dus.ticks[0]); - - frame = gtk_frame_new("Write"); - gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2); - vbox = gtk_hbox_new(TRUE, 3); - gtk_container_add(GTK_CONTAINER(frame), vbox); - entry = new_info_entry_in_frame(vbox, "IOs"); - entry_set_int_value(entry, p->dus.ios[1]); - entry = new_info_entry_in_frame(vbox, "Merges"); - entry_set_int_value(entry, p->dus.merges[1]); - entry = new_info_entry_in_frame(vbox, "Sectors"); - entry_set_int_value(entry, p->dus.sectors[1]); - entry = new_info_entry_in_frame(vbox, "Ticks"); - entry_set_int_value(entry, p->dus.ticks[1]); + gtk_list_store_set(ui->log_model, &iter, 0, timebuf, -1); + gtk_list_store_set(ui->log_model, &iter, 1, client->hostname, -1); + gtk_list_store_set(ui->log_model, &iter, 2, p->level, -1); + gtk_list_store_set(ui->log_model, &iter, 3, p->buf, -1); - frame = gtk_frame_new("Shared"); - gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 2); - vbox = gtk_hbox_new(TRUE, 3); - gtk_container_add(GTK_CONTAINER(frame), vbox); - entry = new_info_entry_in_frame(vbox, "IO ticks"); - entry_set_int_value(entry, p->dus.io_ticks); - entry = new_info_entry_in_frame(vbox, "Time in queue"); - entry_set_int_value(entry, p->dus.time_in_queue); + if (p->level == FIO_LOG_ERR) + view_log(NULL, (gpointer) ui); - util = 0.0; - if (p->dus.msec) - util = (double) 100 * p->dus.io_ticks / (double) p->dus.msec; - if (util > 100.0) - util = 100.0; + gdk_threads_leave(); +} - sprintf(tmp, "%3.2f%%", util); - entry = new_info_entry_in_frame(vbox, "Disk utilization"); - gtk_entry_set_text(GTK_ENTRY(entry), tmp); +static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd) +{ + struct cmd_du_pdu *p = (struct cmd_du_pdu *) cmd->payload; + struct gfio_client *gc = client->client_data; + struct gui_entry *ge = gc->ge; + unsigned int nr = gc->nr_du; - gtk_widget_show_all(gc->results_widget); -out: + gc->du = realloc(gc->du, (nr + 1) * sizeof(struct cmd_du_pdu)); + memcpy(&gc->du[nr], p, sizeof(*p)); + gc->nr_du++; + + gdk_threads_enter(); + if (ge->results_window) + __gfio_disk_util_show(ge->results_notebook, gc, p); + else + gfio_disk_util_show(gc); gdk_threads_leave(); } @@ -1269,6 +1569,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 +1880,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; @@ -1594,8 +1895,11 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) struct gfio_client *gc = client->client_data; struct thread_options *o = &gc->o; struct gui_entry *ge = gc->ge; - char tmp[8]; + char *c1, *c2, *c3, *c4; + char tmp[80]; + 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(); @@ -1606,17 +1910,28 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) gtk_combo_box_set_active(GTK_COMBO_BOX(ge->eta.names), 0); multitext_add_entry(&ge->eta.iotype, ddir_str(o->td_ddir)); + + c1 = fio_uint_to_kmg(o->min_bs[DDIR_READ]); + c2 = fio_uint_to_kmg(o->max_bs[DDIR_WRITE]); + c3 = fio_uint_to_kmg(o->min_bs[DDIR_READ]); + c4 = fio_uint_to_kmg(o->max_bs[DDIR_WRITE]); + sprintf(tmp, "%s-%s/%s-%s", c1, c2, c3, c4); + free(c1); + free(c2); + free(c3); + free(c4); + multitext_add_entry(&ge->eta.bs, tmp); + multitext_add_entry(&ge->eta.ioengine, (const char *) o->ioengine); sprintf(tmp, "%u", o->iodepth); multitext_add_entry(&ge->eta.iodepth, tmp); multitext_set_entry(&ge->eta.iotype, 0); + multitext_set_entry(&ge->eta.bs, 0); multitext_set_entry(&ge->eta.ioengine, 0); multitext_set_entry(&ge->eta.iodepth, 0); - gc->job_added++; - gfio_set_state(ge, GE_STATE_JOB_SENT); gdk_threads_leave(); @@ -1670,8 +1985,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 +2005,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 +2087,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; } @@ -1779,6 +2138,8 @@ static void connect_clicked(GtkWidget *widget, gpointer data) if (!ge->nr_job_files) return; + gc = ge->client; + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ge->thread_status_pb), "No jobs running"); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ge->thread_status_pb), 0.0); ret = fio_client_connect(gc->client); @@ -1815,28 +2176,6 @@ static void send_clicked(GtkWidget *widget, gpointer data) } } -static GtkWidget *add_button(GtkWidget *buttonbox, - struct button_spec *buttonspec, gpointer data) -{ - GtkWidget *button = gtk_button_new_with_label(buttonspec->buttontext); - - g_signal_connect(button, "clicked", G_CALLBACK(buttonspec->f), data); - gtk_box_pack_start(GTK_BOX(buttonbox), button, FALSE, FALSE, 3); - gtk_widget_set_tooltip_text(button, buttonspec->tooltiptext); - gtk_widget_set_sensitive(button, !buttonspec->start_insensitive); - - return button; -} - -static void add_buttons(struct gui_entry *ge, struct button_spec *buttonlist, - int nbuttons) -{ - int i; - - for (i = 0; i < nbuttons; i++) - ge->button[i] = add_button(ge->buttonbox, &buttonlist[i], ge); -} - static void on_info_bar_response(GtkWidget *widget, gint response, gpointer data) { @@ -2039,25 +2378,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 +2385,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 +2464,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) @@ -2188,16 +2517,13 @@ static int do_file_open(struct gui_entry *ge, const gchar *uri, char *host, return 0; } -static void file_open(GtkWidget *w, gpointer data) +static int do_file_open_with_tab(struct gui *ui, const gchar *uri) { - struct gui *ui = data; - GtkWidget *dialog; - GSList *filenames, *fn_glist; - GtkFileFilter *filter; - int port, type, server_start, ge_is_new = 0; + int port, type, server_start; struct gui_entry *ge; gint cur_page; char *host; + int ret, ge_is_new = 0; /* * Creates new tab if current tab is the main window, or the @@ -2212,6 +2538,47 @@ static void file_open(GtkWidget *w, gpointer data) gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num); + if (get_connection_details(&host, &port, &type, &server_start)) { + if (ge_is_new) + gtk_widget_destroy(ge->vbox); + + return 1; + } + + ret = do_file_open(ge, uri, host, type, port); + + free(host); + + if (!ret) { + if (server_start) + gfio_start_server(); + } else { + if (ge_is_new) + gtk_widget_destroy(ge->vbox); + } + + return ret; +} + +static void recent_open(GtkAction *action, gpointer data) +{ + struct gui *ui = (struct gui *) data; + GtkRecentInfo *info; + const gchar *uri; + + info = g_object_get_data(G_OBJECT(action), "gtk-recent-info"); + uri = gtk_recent_info_get_uri(info); + + do_file_open_with_tab(ui, uri); +} + +static void file_open(GtkWidget *w, gpointer data) +{ + struct gui *ui = data; + GtkWidget *dialog; + GSList *filenames, *fn_glist; + GtkFileFilter *filter; + dialog = gtk_file_chooser_dialog_new("Open File", GTK_WINDOW(ui->window), GTK_FILE_CHOOSER_ACTION_OPEN, @@ -2229,9 +2596,6 @@ static void file_open(GtkWidget *w, gpointer data) gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter); if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { - if (ge_is_new) - gtk_widget_destroy(ge->vbox); - gtk_widget_destroy(dialog); return; } @@ -2240,26 +2604,14 @@ static void file_open(GtkWidget *w, gpointer data) gtk_widget_destroy(dialog); - if (get_connection_details(&host, &port, &type, &server_start)) { - if (ge_is_new) - gtk_widget_destroy(ge->vbox); - - goto done; - } - filenames = fn_glist; while (filenames != NULL) { - do_file_open(ge, filenames->data, host, type, port); - g_free(filenames->data); + if (do_file_open_with_tab(ui, filenames->data)) + break; filenames = g_slist_next(filenames); } - free(host); - if (server_start) - gfio_start_server(); -done: g_slist_free(fn_glist); - } static void file_save(GtkWidget *w, gpointer data) @@ -2362,6 +2714,24 @@ 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); @@ -2523,6 +2893,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) }, @@ -2537,9 +2908,9 @@ static const gchar *ui_string = " \ \ \ \ + \ \ \ - \ \ \ \ @@ -2557,6 +2928,8 @@ static const gchar *ui_string = " \ \ \ \ + \ + \ \ \ \ @@ -2566,18 +2939,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"); @@ -2605,6 +2970,7 @@ static void combo_entry_changed(GtkComboBox *box, gpointer data) index = gtk_combo_box_get_active(box); multitext_set_entry(&ge->eta.iotype, index); + multitext_set_entry(&ge->eta.bs, index); multitext_set_entry(&ge->eta.ioengine, index); multitext_set_entry(&ge->eta.iodepth, index); } @@ -2614,6 +2980,7 @@ static void combo_entry_destroy(GtkWidget *widget, gpointer data) struct gui_entry *ge = (struct gui_entry *) data; multitext_free(&ge->eta.iotype); + multitext_free(&ge->eta.bs); multitext_free(&ge->eta.ioengine); multitext_free(&ge->eta.iodepth); } @@ -2622,7 +2989,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); @@ -2650,6 +3016,7 @@ static GtkWidget *new_client_page(struct gui_entry *ge) g_signal_connect(ge->eta.names, "changed", G_CALLBACK(combo_entry_changed), ge); g_signal_connect(ge->eta.names, "destroy", G_CALLBACK(combo_entry_destroy), ge); ge->eta.iotype.entry = new_info_entry_in_frame(probe_box, "IO"); + ge->eta.bs.entry = new_info_entry_in_frame(probe_box, "Blocksize (Read/Write)"); ge->eta.ioengine.entry = new_info_entry_in_frame(probe_box, "IO Engine"); ge->eta.iodepth.entry = new_info_entry_in_frame(probe_box, "IO Depth"); ge->eta.jobs = new_info_entry_in_frame(probe_box, "Jobs"); @@ -2679,7 +3046,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); @@ -2724,7 +3090,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); @@ -2767,7 +3132,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); @@ -2815,6 +3179,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; } @@ -2826,53 +3191,6 @@ static gboolean notebook_switch_page(GtkNotebook *notebook, GtkWidget *widget, return TRUE; } -static void recent_open(GtkAction *action, gpointer data) -{ - struct gui *ui = (struct gui *) data; - int port, type, server_start; - struct gui_entry *ge; - GtkRecentInfo *info; - const gchar *uri; - gint cur_page; - char *host; - int ret, ge_is_new = 0; - - /* - * Creates new tab if current tab is the main window, or the - * current tab already has a client. - */ - cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook)); - ge = get_ge_from_page(cur_page, &ge_is_new); - if (ge->client) { - ge = get_new_ge_with_tab("Untitled"); - ge_is_new = 1; - } - - gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num); - - info = g_object_get_data(G_OBJECT(action), "gtk-recent-info"); - uri = gtk_recent_info_get_uri(info); - - if (get_connection_details(&host, &port, &type, &server_start)) { - if (ge_is_new) - gtk_widget_destroy(ge->vbox); - - return; - } - - ret = do_file_open(ge, uri, host, type, port); - - free(host); - - if (!ret) { - if (server_start) - gfio_start_server(); - } else { - if (ge_is_new) - gtk_widget_destroy(ge->vbox); - } -} - static gint compare_recent_items(GtkRecentInfo *a, GtkRecentInfo *b) { time_t time_a = gtk_recent_info_get_visited(a); @@ -2951,6 +3269,38 @@ static void add_recent_file_items(struct gui *ui) g_list_free(items); } +static void drag_and_drop_received(GtkWidget *widget, GdkDragContext *ctx, + gint x, gint y, GtkSelectionData *data, + guint info, guint time) +{ + struct gui *ui = &main_ui; + gchar **uris; + GtkWidget *source; + int i; + + source = gtk_drag_get_source_widget(ctx); + if (source && widget == gtk_widget_get_toplevel(source)) { + gtk_drag_finish(ctx, FALSE, FALSE, time); + return; + } + + uris = gtk_selection_data_get_uris(data); + if (!uris) { + gtk_drag_finish(ctx, FALSE, FALSE, time); + return; + } + + i = 0; + while (uris[i]) { + if (do_file_open_with_tab(ui, uris[i])) + break; + i++; + } + + gtk_drag_finish(ctx, TRUE, FALSE, time); + g_strfreev(uris); +} + static void init_ui(int *argc, char **argv[], struct gui *ui) { GtkSettings *settings; @@ -2968,9 +3318,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); @@ -2993,6 +3344,9 @@ static void init_ui(int *argc, char **argv[], struct gui *ui) gtk_container_add(GTK_CONTAINER(ui->vbox), ui->notebook); vbox = new_main_page(ui); + gtk_drag_dest_set(GTK_WIDGET(ui->window), GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY); + gtk_drag_dest_add_uri_targets(GTK_WIDGET(ui->window)); + g_signal_connect(ui->window, "drag-data-received", G_CALLBACK(drag_and_drop_received), ui); gtk_notebook_append_page(GTK_NOTEBOOK(ui->notebook), vbox, gtk_label_new("Main"));