X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=40ef34c92a63663e1d9d52fc157e292534a1f5f1;hp=4bf8fbe9066b0c504a3930e03f4b80cd0b45a691;hb=02421e6997342004577a773c36ab11da989d24bd;hpb=def0ac29a7eb92282cf7f208b229261bb254ca00 diff --git a/gfio.c b/gfio.c index 4bf8fbe9..40ef34c9 100644 --- a/gfio.c +++ b/gfio.c @@ -68,11 +68,18 @@ struct probe_widget { GtkWidget *fio_ver; }; +struct multitext_widget { + GtkWidget *entry; + char **text; + unsigned int cur_text; + unsigned int max_text; +}; + struct eta_widget { GtkWidget *names; - GtkWidget *iotype; - GtkWidget *ioengine; - GtkWidget *iodepth; + struct multitext_widget iotype; + struct multitext_widget ioengine; + struct multitext_widget iodepth; GtkWidget *jobs; GtkWidget *files; GtkWidget *read_bw; @@ -97,6 +104,8 @@ struct gfio_graphs { * Main window widgets and data */ struct gui { + GtkUIManager *uimanager; + GtkWidget *menu; GtkWidget *window; GtkWidget *vbox; GtkWidget *topvbox; @@ -133,6 +142,7 @@ struct gui_entry { GtkWidget *topvbox; GtkWidget *topalign; GtkWidget *bottomalign; + GtkWidget *job_notebook; GtkWidget *thread_status_pb; GtkWidget *buttonbox; GtkWidget *button[ARRAYSIZE(buttonspeclist)]; @@ -244,6 +254,54 @@ 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), ""); @@ -254,9 +312,9 @@ static void clear_ge_ui_info(struct gui_entry *ge) /* should we empty it... */ gtk_entry_set_text(GTK_ENTRY(ge->eta.name), ""); #endif - gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), ""); - gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), ""); - gtk_entry_set_text(GTK_ENTRY(ge->eta.iodepth), ""); + multitext_update_entry(&ge->eta.iotype, 0, ""); + multitext_update_entry(&ge->eta.ioengine, 0, ""); + multitext_update_entry(&ge->eta.iodepth, 0, ""); gtk_entry_set_text(GTK_ENTRY(ge->eta.jobs), ""); gtk_entry_set_text(GTK_ENTRY(ge->eta.files), ""); gtk_entry_set_text(GTK_ENTRY(ge->eta.read_bw), ""); @@ -351,6 +409,24 @@ static void entry_set_int_value(GtkWidget *entry, unsigned int val) gtk_entry_set_text(GTK_ENTRY(entry), tmp); } +static void show_info_dialog(struct gui *ui, const char *title, + const char *message) +{ + GtkWidget *dialog, *content, *label; + + dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(ui->window), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + + content = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); + label = gtk_label_new(message); + gtk_container_add(GTK_CONTAINER(content), label); + gtk_widget_show_all(dialog); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +} + #define ALIGN_LEFT 1 #define ALIGN_RIGHT 2 #define INVISIBLE 4 @@ -1420,11 +1496,15 @@ 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); - gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), ddir_str(o->td_ddir)); - gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), (gchar *) o->ioengine); + multitext_add_entry(&ge->eta.iotype, ddir_str(o->td_ddir)); + multitext_add_entry(&ge->eta.ioengine, (const char *) o->ioengine); sprintf(tmp, "%u", o->iodepth); - gtk_entry_set_text(GTK_ENTRY(ge->eta.iodepth), tmp); + multitext_add_entry(&ge->eta.iodepth, tmp); + + multitext_set_entry(&ge->eta.iotype, 0); + multitext_set_entry(&ge->eta.ioengine, 0); + multitext_set_entry(&ge->eta.iodepth, 0); gc->job_added++; @@ -1434,7 +1514,6 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) static void gfio_client_timed_out(struct fio_client *client) { struct gfio_client *gc = client->client_data; - GtkWidget *dialog, *label, *content; char buf[256]; gdk_threads_enter(); @@ -1443,22 +1522,7 @@ static void gfio_client_timed_out(struct fio_client *client) clear_ge_ui_info(gc->ge); sprintf(buf, "Client %s: timeout talking to server.\n", client->hostname); - - dialog = gtk_dialog_new_with_buttons("Timed out!", - GTK_WINDOW(main_ui.window), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - - /* gtk_dialog_get_content_area() is 2.14 and newer */ - content = GTK_DIALOG(dialog)->vbox; - - label = gtk_label_new((const gchar *) buf); - gtk_container_add(GTK_CONTAINER(content), label); - gtk_widget_show_all(dialog); - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); - - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); + show_info_dialog(gc->ge->ui, "Network timeout", buf); gdk_threads_leave(); } @@ -1854,8 +1918,12 @@ static void ge_destroy(GtkWidget *w, gpointer data) struct gui_entry *ge = data; struct gfio_client *gc = ge->client; - if (gc->client) + if (gc && gc->client) { + if (ge->connected) + fio_client_terminate(gc->client); + fio_put_client(gc->client); + } flist_del(&ge->list); free(ge); @@ -1879,7 +1947,11 @@ static struct gui_entry *get_new_ge_with_tab(const char *name) static void file_new(GtkWidget *w, gpointer data) { - get_new_ge_with_tab("Untitled"); + struct gui *ui = (struct gui *) data; + struct gui_entry *ge; + + ge = get_new_ge_with_tab("Untitled"); + gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num); } /* @@ -1903,6 +1975,25 @@ static struct gui_entry *get_ge_from_page(unsigned int cur_page) return NULL; } +static void file_close(GtkWidget *w, gpointer data) +{ + struct gui *ui = (struct gui *) data; + gint cur_page; + + /* + * Can't close the main tab + */ + cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook)); + if (cur_page) { + struct gui_entry *ge = get_ge_from_page(cur_page); + + gtk_widget_destroy(ge->vbox); + return; + } + + show_info_dialog(ui, "Error", "The main page view cannot be closed\n"); +} + static void file_open(GtkWidget *w, gpointer data) { struct gui *ui = data; @@ -2048,6 +2139,10 @@ static void view_log(GtkWidget *w, gpointer data) gtk_widget_show_all(win); } +static void edit_options(GtkWidget *w, gpointer data) +{ +} + static void __update_graph_limits(struct gfio_graphs *g) { line_graph_set_data_count_limit(g->iops_graph, gfio_graph_limit); @@ -2201,12 +2296,15 @@ static void about_dialog(GtkWidget *w, gpointer data) static GtkActionEntry menu_items[] = { { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, { "ViewMenuAction", GTK_STOCK_FILE, "View", NULL, NULL, NULL}, + { "JobMenuAction", GTK_STOCK_FILE, "Job", NULL, NULL, NULL}, { "HelpMenuAction", GTK_STOCK_HELP, "Help", NULL, NULL, NULL}, { "NewFile", GTK_STOCK_NEW, "New", "N", NULL, G_CALLBACK(file_new) }, + { "CloseFile", GTK_STOCK_CLOSE, "Close", "W", NULL, G_CALLBACK(file_close) }, { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, { "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) }, + { "EditOptions", NULL, "Edit Options", "E", NULL, G_CALLBACK(edit_options) }, { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit_clicked) }, { "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(about_dialog) }, }; @@ -2217,6 +2315,7 @@ static const gchar *ui_string = " \ \ \ \ + \ \ \ \ @@ -2225,6 +2324,9 @@ static const gchar *ui_string = " \ \ \ \ + \ + \ + \ \ \ \ @@ -2235,6 +2337,14 @@ 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) { @@ -2248,6 +2358,7 @@ static GtkWidget *get_menubar_menu(GtkWidget *window, GtkUIManager *ui_manager, gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error); gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager)); + return gtk_ui_manager_get_widget(ui_manager, "/MainMenu"); } @@ -2257,6 +2368,27 @@ void gfio_ui_setup(GtkSettings *settings, GtkWidget *menubar, gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); } +static void combo_entry_changed(GtkComboBox *box, gpointer data) +{ + struct gui_entry *ge = (struct gui_entry *) data; + gint index; + + index = gtk_combo_box_get_active(box); + + multitext_set_entry(&ge->eta.iotype, index); + multitext_set_entry(&ge->eta.ioengine, index); + multitext_set_entry(&ge->eta.iodepth, index); +} + +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.ioengine); + multitext_free(&ge->eta.iodepth); +} + static GtkWidget *new_client_page(struct gui_entry *ge) { GtkWidget *main_vbox, *probe, *probe_frame, *probe_box; @@ -2285,9 +2417,11 @@ static GtkWidget *new_client_page(struct gui_entry *ge) gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3); ge->eta.names = new_combo_entry_in_frame(probe_box, "Jobs"); - ge->eta.iotype = new_info_entry_in_frame(probe_box, "IO"); - ge->eta.ioengine = new_info_entry_in_frame(probe_box, "IO Engine"); - ge->eta.iodepth = new_info_entry_in_frame(probe_box, "IO Depth"); + 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.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"); ge->eta.files = new_info_entry_in_frame(probe_box, "Open files"); @@ -2448,14 +2582,16 @@ static gboolean notebook_switch_page(GtkNotebook *notebook, GtkWidget *widget, guint page, gpointer data) { + struct gui *ui = (struct gui *) data; + + set_job_menu_visible(ui, page); return TRUE; } static void init_ui(int *argc, char **argv[], struct gui *ui) { GtkSettings *settings; - GtkUIManager *uimanager; - GtkWidget *menu, *vbox; + GtkWidget *vbox; /* Magical g*thread incantation, you just need this thread stuff. * Without it, the update that happens in gfio_update_thread_status @@ -2480,9 +2616,9 @@ static void init_ui(int *argc, char **argv[], struct gui *ui) ui->vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(ui->window), ui->vbox); - uimanager = gtk_ui_manager_new(); - menu = get_menubar_menu(ui->window, uimanager, ui); - gfio_ui_setup(settings, menu, ui->vbox, uimanager); + ui->uimanager = gtk_ui_manager_new(); + ui->menu = get_menubar_menu(ui->window, ui->uimanager, ui); + gfio_ui_setup(settings, ui->menu, ui->vbox, ui->uimanager); ui->notebook = gtk_notebook_new(); g_signal_connect(ui->notebook, "switch-page", G_CALLBACK(notebook_switch_page), ui);