X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=b1e9b5f75ac234af1c7ea59bf9ce77b2669a5439;hp=7dcb18822db81516830fd2def5c0865be5190fb1;hb=2eb98bf64531b4d4f00b27f3854562ab576ebb2f;hpb=2f122b135b7319ff8dd04dadf31ff28b301051a3 diff --git a/gfio.c b/gfio.c index 7dcb1882..b1e9b5f7 100644 --- a/gfio.c +++ b/gfio.c @@ -30,10 +30,11 @@ #include #include "fio.h" +#include "gfio.h" +#include "ghelpers.h" +#include "goptions.h" #include "graph.h" -#define GFIO_MIME "text/fio" - static int gfio_server_running; static const char *gfio_graph_font; static unsigned int gfio_graph_limit = 100; @@ -41,8 +42,6 @@ static GdkColor white; static void view_log(GtkWidget *w, gpointer data); -#define ARRAYSIZE(x) (sizeof((x)) / (sizeof((x)[0]))) - typedef void (*clickfunction)(GtkWidget *widget, gpointer data); static void connect_clicked(GtkWidget *widget, gpointer data); @@ -52,155 +51,32 @@ 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 }, - { "Start Job", start_job_clicked, - "Start the current job on the server", 1 }, -}; - -struct probe_widget { - GtkWidget *hostname; - GtkWidget *os; - GtkWidget *arch; - GtkWidget *fio_ver; -}; - -struct multitext_widget { - GtkWidget *entry; - char **text; - unsigned int cur_text; - unsigned int max_text; -}; - -struct eta_widget { - GtkWidget *names; - struct multitext_widget iotype; - struct multitext_widget ioengine; - struct multitext_widget iodepth; - GtkWidget *jobs; - GtkWidget *files; - GtkWidget *read_bw; - GtkWidget *read_iops; - GtkWidget *cr_bw; - GtkWidget *cr_iops; - GtkWidget *write_bw; - GtkWidget *write_iops; - GtkWidget *cw_bw; - GtkWidget *cw_iops; -}; - -struct gfio_graphs { -#define DRAWING_AREA_XDIM 1000 -#define DRAWING_AREA_YDIM 400 - GtkWidget *drawing_area; - struct graph *iops_graph; - struct graph *bandwidth_graph; -}; - -/* - * Main window widgets and data - */ -struct gui { - GtkUIManager *uimanager; - GtkRecentManager *recentmanager; - GtkActionGroup *actiongroup; - guint recent_ui_id; - GtkWidget *menu; - GtkWidget *window; - GtkWidget *vbox; - GtkWidget *thread_status_pb; - GtkWidget *buttonbox; - GtkWidget *notebook; - GtkWidget *error_info_bar; - GtkWidget *error_label; - GtkListStore *log_model; - GtkWidget *log_tree; - GtkWidget *log_view; - struct gfio_graphs graphs; - struct probe_widget probe; - struct eta_widget eta; - pthread_t server_t; - - pthread_t t; - int handler_running; - - struct flist_head list; -} main_ui; - -enum { - GE_STATE_NEW = 1, - GE_STATE_CONNECTED, - GE_STATE_JOB_SENT, - GE_STATE_JOB_STARTED, - GE_STATE_JOB_RUNNING, - GE_STATE_JOB_DONE, -}; - -/* - * Notebook entry - */ -struct gui_entry { - struct flist_head list; - struct gui *ui; - - GtkWidget *vbox; - GtkWidget *job_notebook; - GtkWidget *thread_status_pb; - GtkWidget *buttonbox; - GtkWidget *button[ARRAYSIZE(buttonspeclist)]; - GtkWidget *notebook; - GtkWidget *error_info_bar; - 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; - struct gfio_graphs graphs; - struct probe_widget probe; - struct eta_widget eta; - GtkWidget *page_label; - 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_vbox; - GtkWidget *err_entry; - unsigned int job_added; - struct thread_options o; - - struct end_results *results; - unsigned int nr_results; + { + .buttontext = "Connect", + .f = connect_clicked, + .tooltiptext = { "Disconnect from host", "Connect to host" }, + .start_sensitive = 1, + }, + { + .buttontext = "Send", + .f = send_clicked, + .tooltiptext = { "Send job description to host", NULL }, + .start_sensitive = 0, + }, + { + .buttontext = "Start Job", + .f = start_job_clicked, + .tooltiptext = { "Start the current job on the server", NULL }, + .start_sensitive = 0, + }, }; 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 report_error(GError *error); static struct graph *setup_iops_graph(void) { @@ -241,54 +117,6 @@ static void setup_graphs(struct gfio_graphs *g) g->bandwidth_graph = setup_bandwidth_graph(); } -static void multitext_add_entry(struct multitext_widget *mt, const char *text) -{ - mt->text = realloc(mt->text, (mt->max_text + 1) * sizeof(char *)); - mt->text[mt->max_text] = strdup(text); - mt->max_text++; -} - -static void multitext_set_entry(struct multitext_widget *mt, unsigned int index) -{ - if (index >= mt->max_text) - return; - if (!mt->text || !mt->text[index]) - return; - - mt->cur_text = index; - gtk_entry_set_text(GTK_ENTRY(mt->entry), mt->text[index]); -} - -static void multitext_update_entry(struct multitext_widget *mt, - unsigned int index, const char *text) -{ - if (!mt->text) - return; - - if (mt->text[index]) - free(mt->text[index]); - - mt->text[index] = strdup(text); - if (mt->cur_text == index) - gtk_entry_set_text(GTK_ENTRY(mt->entry), mt->text[index]); -} - -static void multitext_free(struct multitext_widget *mt) -{ - int i; - - gtk_entry_set_text(GTK_ENTRY(mt->entry), ""); - - for (i = 0; i < mt->max_text; i++) { - if (mt->text[i]) - free(mt->text[i]); - } - - free(mt->text); - mt->cur_text = -1; - mt->max_text = 0; -} - static void clear_ge_ui_info(struct gui_entry *ge) { gtk_label_set_text(GTK_LABEL(ge->probe.hostname), ""); @@ -300,6 +128,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), ""); @@ -310,76 +139,6 @@ static void clear_ge_ui_info(struct gui_entry *ge) gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), ""); } -static GtkWidget *new_combo_entry_in_frame(GtkWidget *box, const char *label) -{ - GtkWidget *entry, *frame; - - frame = gtk_frame_new(label); - entry = gtk_combo_box_new_text(); - gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 3); - gtk_container_add(GTK_CONTAINER(frame), entry); - - return entry; -} - -static GtkWidget *new_info_entry_in_frame(GtkWidget *box, const char *label) -{ - GtkWidget *entry, *frame; - - frame = gtk_frame_new(label); - entry = gtk_entry_new(); - gtk_entry_set_editable(GTK_ENTRY(entry), 0); - gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 3); - gtk_container_add(GTK_CONTAINER(frame), entry); - - return entry; -} - -static GtkWidget *new_info_label_in_frame(GtkWidget *box, const char *label) -{ - GtkWidget *label_widget; - GtkWidget *frame; - - frame = gtk_frame_new(label); - label_widget = gtk_label_new(NULL); - gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 3); - gtk_container_add(GTK_CONTAINER(frame), label_widget); - - return label_widget; -} - -static GtkWidget *create_spinbutton(GtkWidget *hbox, double min, double max, double defval) -{ - GtkWidget *button, *box; - - box = gtk_hbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(hbox), box); - - button = gtk_spin_button_new_with_range(min, max, 1.0); - gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0); - - gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(button), defval); - - return button; -} - -static void label_set_int_value(GtkWidget *entry, unsigned int val) -{ - char tmp[80]; - - sprintf(tmp, "%u", val); - gtk_label_set_text(GTK_LABEL(entry), tmp); -} - -static void entry_set_int_value(GtkWidget *entry, unsigned int val) -{ - char tmp[80]; - - sprintf(tmp, "%u", val); - gtk_entry_set_text(GTK_ENTRY(entry), tmp); -} - static void show_info_dialog(struct gui *ui, const char *title, const char *message) { @@ -432,6 +191,39 @@ 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. @@ -452,21 +244,21 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge) case GE_STATE_NEW: connect_state = 1; - edit_state = 0; + edit_state = 1; connect_str = "Connect"; send_state = 0; start_state = 0; break; case GE_STATE_CONNECTED: connect_state = 1; - edit_state = 0; + edit_state = 1; connect_str = "Disconnect"; send_state = 1; start_state = 0; break; case GE_STATE_JOB_SENT: connect_state = 1; - edit_state = 0; + edit_state = 1; connect_str = "Disconnect"; send_state = 0; start_state = 1; @@ -494,10 +286,11 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge) break; } - gtk_widget_set_sensitive(ge->button[CONNECT_BUTTON], connect_state); - 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_sensitive(ge->button[GFIO_BUTTON_CONNECT], connect_state); + gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_SEND], send_state); + gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_START], start_state); + gtk_button_set_label(GTK_BUTTON(ge->button[GFIO_BUTTON_CONNECT]), connect_str); + gtk_widget_set_tooltip_text(ge->button[GFIO_BUTTON_CONNECT], get_button_tooltip(&buttonspeclist[GFIO_BUTTON_CONNECT], connect_state)); set_menu_entry_visible(ui, "/MainMenu/JobMenu/Connect", connect_state); set_menu_entry_text(ui, "/MainMenu/JobMenu/Connect", connect_str); @@ -518,51 +311,6 @@ static void gfio_set_state(struct gui_entry *ge, unsigned int state) update_button_states(ge->ui, ge); } -#define ALIGN_LEFT 1 -#define ALIGN_RIGHT 2 -#define INVISIBLE 4 -#define UNSORTABLE 8 - -GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title, unsigned int flags) -{ - GtkCellRenderer *renderer; - GtkTreeViewColumn *col; - double xalign = 0.0; /* left as default */ - PangoAlignment align; - gboolean visible; - - align = (flags & ALIGN_LEFT) ? PANGO_ALIGN_LEFT : - (flags & ALIGN_RIGHT) ? PANGO_ALIGN_RIGHT : - PANGO_ALIGN_CENTER; - visible = !(flags & INVISIBLE); - - renderer = gtk_cell_renderer_text_new(); - col = gtk_tree_view_column_new(); - - gtk_tree_view_column_set_title(col, title); - if (!(flags & UNSORTABLE)) - gtk_tree_view_column_set_sort_column_id(col, index); - gtk_tree_view_column_set_resizable(col, TRUE); - gtk_tree_view_column_pack_start(col, renderer, TRUE); - gtk_tree_view_column_add_attribute(col, renderer, "text", index); - gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL); - switch (align) { - case PANGO_ALIGN_LEFT: - xalign = 0.0; - break; - case PANGO_ALIGN_CENTER: - xalign = 0.5; - break; - case PANGO_ALIGN_RIGHT: - xalign = 1.0; - break; - } - gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), xalign, 0.5); - gtk_tree_view_column_set_visible(col, visible); - gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col); - return col; -} - static void gfio_ui_setup_log(struct gui *ui) { GtkTreeSelection *selection; @@ -599,6 +347,7 @@ static struct graph *setup_clat_graph(char *title, unsigned int *ovals, g = graph_new(xdim, ydim, gfio_graph_font); graph_title(g, title); graph_x_title(g, "Percentile"); + graph_y_title(g, "Time"); for (i = 0; i < len; i++) { char fbuf[8]; @@ -909,6 +658,7 @@ static struct graph *setup_lat_bucket_graph(const char *title, double *lat, g = graph_new(xdim, ydim, gfio_graph_font); graph_title(g, title); graph_x_title(g, "Buckets"); + graph_y_title(g, "Percent"); for (i = 0; i < len; i++) { graph_add_label(g, labels[i]); @@ -1247,6 +997,136 @@ static GtkWidget *get_results_window(struct gui_entry *ge) return ge->results_notebook; } +static void disk_util_destroy(GtkWidget *w, gpointer data) +{ + struct gui_entry *ge = (struct gui_entry *) data; + + ge->disk_util_vbox = NULL; + gtk_widget_destroy(w); +} + +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, FALSE, 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) { @@ -1277,8 +1157,6 @@ static void __gfio_display_end_results(GtkWidget *win, struct gfio_client *gc, gtk_notebook_append_page(GTK_NOTEBOOK(win), scroll, gtk_label_new(ts->name)); - gc->results_widget = vbox; - entry = new_info_entry_in_frame(box, "Name"); gtk_entry_set_text(GTK_ENTRY(entry), ts->name); if (strlen(ts->description)) { @@ -1318,18 +1196,23 @@ static void gfio_display_end_results(struct gfio_client *gc) __gfio_display_end_results(res_notebook, gc, &e->ts, &e->gs); } - gtk_widget_show_all(ge->results_window); + if (gfio_disk_util_show(gc)) + 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; + struct gui_entry *ge = gc->ge; gfio_add_end_results(gc, ts, rs); gdk_threads_enter(); - gfio_display_end_results(gc); + if (ge->results_window) + __gfio_display_end_results(ge->results_notebook, gc, ts, rs); + else + gfio_display_end_results(gc); gdk_threads_leave(); } @@ -1365,79 +1248,18 @@ 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_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_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); + struct gui_entry *ge = gc->ge; + unsigned int nr = gc->nr_du; - 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; + gc->du = realloc(gc->du, (nr + 1) * sizeof(struct cmd_du_pdu)); + memcpy(&gc->du[nr], p, sizeof(*p)); + gc->nr_du++; - 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(gc->results_widget); -out: + 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(); } @@ -1787,7 +1609,8 @@ 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); @@ -1800,18 +1623,30 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) gtk_combo_box_append_text(GTK_COMBO_BOX(ge->eta.names), (gchar *) o->name); gtk_combo_box_set_active(GTK_COMBO_BOX(ge->eta.names), 0); - multitext_add_entry(&ge->eta.iotype, ddir_str(o->td_ddir)); + sprintf(tmp, "%s %s", o->odirect ? "direct" : "buffered", ddir_str(o->td_ddir)); + multitext_add_entry(&ge->eta.iotype, tmp); + + 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(); @@ -1911,6 +1746,9 @@ static void ge_destroy(struct gui_entry *ge) static void ge_widget_destroy(GtkWidget *w, gpointer data) { + struct gui_entry *ge = (struct gui_entry *) data; + + ge_destroy(ge); } static void gfio_quit(struct gui *ui) @@ -1928,7 +1766,7 @@ static void gfio_quit(struct gui *ui) static void quit_clicked(__attribute__((unused)) GtkWidget *widget, __attribute__((unused)) gpointer data) { - gfio_quit(data); + gfio_quit(&main_ui); } static void *job_thread(void *arg) @@ -2018,6 +1856,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); @@ -2050,32 +1890,10 @@ static void send_clicked(GtkWidget *widget, gpointer data) report_error(error); g_error_free(error); - gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], 1); + gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_START], 1); } } -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) { @@ -2087,7 +1905,7 @@ static void on_info_bar_response(GtkWidget *widget, gint response, } } -void report_error(GError *error) +static void report_error(GError *error) { struct gui *ui = &main_ui; @@ -2255,6 +2073,7 @@ static void gfio_client_added(struct gui_entry *ge, struct fio_client *client) gc = malloc(sizeof(*gc)); memset(gc, 0, sizeof(*gc)); + options_default_fill(&gc->o); gc->ge = ge; gc->client = fio_get_client(client); @@ -2602,6 +2421,12 @@ static void send_job_entry(GtkWidget *w, gpointer data) static void edit_job_entry(GtkWidget *w, gpointer data) { + struct gui *ui = (struct gui *) data; + struct gui_entry *ge; + + ge = get_ge_from_cur_tab(ui); + if (ge && ge->client) + gopt_get_options_window(ui->window, &ge->client->o); } static void start_job_entry(GtkWidget *w, gpointer data) @@ -2632,7 +2457,6 @@ static void view_results(GtkWidget *w, gpointer data) 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); @@ -2795,7 +2619,7 @@ static GtkActionEntry menu_items[] = { { "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) }, + { "ConnectJob", NULL, "Connect", "D", 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) }, { "StartJob", NULL, "Start job", "L", NULL, G_CALLBACK(start_job_entry) }, @@ -2809,9 +2633,9 @@ static const gchar *ui_string = " \ \ \ \ + \ \ \ - \ \ \ \ @@ -2871,6 +2695,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); } @@ -2880,6 +2705,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); } @@ -2915,6 +2741,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");