X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=20831c830a03e88150556f03e73e57ccdae8f5b0;hp=852214e631cc7b41fc8a7f809ca4a565f7cfd936;hb=807f9971e7bfedfc905d2cb2c38a6e558db2f343;hpb=91acce97f09596cca64371cf3b29ef382b7e2621 diff --git a/gfio.c b/gfio.c index 852214e6..20831c83 100644 --- a/gfio.c +++ b/gfio.c @@ -26,32 +26,56 @@ #include #include -#include "fio_initialization.h" #include "fio.h" +static void gfio_update_thread_status(char *status_message, double perc); + #define ARRAYSIZE(x) (sizeof((x)) / (sizeof((x)[0]))) typedef void (*clickfunction)(GtkWidget *widget, gpointer data); -static void quit_clicked(GtkWidget *widget, gpointer data); +static void connect_clicked(GtkWidget *widget, gpointer data); static void start_job_clicked(GtkWidget *widget, gpointer data); static struct button_spec { const char *buttontext; clickfunction f; const char *tooltiptext; + const int start_insensitive; } buttonspeclist[] = { -#define START_JOB_BUTTON 0 +#define CONNECT_BUTTON 0 +#define START_JOB_BUTTON 1 + { "Connect", connect_clicked, "Connect to host", 0 }, { "Start Job", start_job_clicked, - "Send current fio job to fio server to be executed" }, -#define QUIT_BUTTON 1 - { "Quit", quit_clicked, "Quit gfio" }, + "Send current fio job to fio server to be executed", 1 }, +}; + +struct probe_widget { + GtkWidget *hostname; + GtkWidget *os; + GtkWidget *arch; + GtkWidget *fio_ver; +}; + +struct eta_widget { + GtkWidget *name; + GtkWidget *iotype; + GtkWidget *ioengine; + GtkWidget *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 gui { - int argc; - char **argv; GtkWidget *window; GtkWidget *vbox; GtkWidget *topvbox; @@ -63,21 +87,41 @@ struct gui { GtkWidget *hostname_hbox; GtkWidget *hostname_label; GtkWidget *hostname_entry; + GtkWidget *port_button; GtkWidget *port_label; - GtkWidget *port_entry; GtkWidget *hostname_combo_box; /* ipv4, ipv6 or socket */ - GtkWidget *jobfile_hbox; - GtkWidget *jobfile_label; - GtkWidget *jobfile_entry; GtkWidget *scrolled_window; GtkWidget *textview; + GtkWidget *error_info_bar; + GtkWidget *error_label; GtkTextBuffer *text; + struct probe_widget probe; + struct eta_widget eta; + int connected; pthread_t t; + + struct fio_client *client; + int nr_job_files; + char **job_files; } ui; +static void gfio_set_connected(struct gui *ui, int connected) +{ + if (connected) { + gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 1); + ui->connected = 1; + gtk_button_set_label(GTK_BUTTON(ui->button[CONNECT_BUTTON]), "Disconnect"); + } else { + ui->connected = 0; + gtk_button_set_label(GTK_BUTTON(ui->button[CONNECT_BUTTON]), "Connect"); + gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 0); + } +} + static void gfio_text_op(struct fio_client *client, FILE *f, __u16 pdu_len, const char *buf) { +#if 0 GtkTextBuffer *buffer; GtkTextIter end; @@ -88,6 +132,9 @@ static void gfio_text_op(struct fio_client *client, gdk_threads_leave(); gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(ui.textview), &end, 0.0, FALSE, 0.0,0.0); +#else + fio_client_ops.text_op(client, f, pdu_len, buf); +#endif } static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd) @@ -108,15 +155,121 @@ static void gfio_group_stats_op(struct fio_net_cmd *cmd) fio_client_ops.group_stats(cmd); } +static void gfio_update_eta(struct jobs_eta *je) +{ + static int eta_good; + char eta_str[128]; + char output[256]; + char tmp[32]; + double perc = 0.0; + int i2p = 0; + + eta_str[0] = '\0'; + output[0] = '\0'; + + if (je->eta_sec != INT_MAX && je->elapsed_sec) { + perc = (double) je->elapsed_sec / (double) (je->elapsed_sec + je->eta_sec); + eta_to_str(eta_str, je->eta_sec); + } + + sprintf(tmp, "%u", je->nr_running); + gtk_label_set_text(GTK_LABEL(ui.eta.jobs), tmp); + sprintf(tmp, "%u", je->files_open); + gtk_label_set_text(GTK_LABEL(ui.eta.files), tmp); + +#if 0 + if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) { + if (je->m_rate || je->t_rate) { + char *tr, *mr; + + mr = num2str(je->m_rate, 4, 0, i2p); + tr = num2str(je->t_rate, 4, 0, i2p); + gtk_label_set_text(GTK_LABEL(ui.eta. + p += sprintf(p, ", CR=%s/%s KB/s", tr, mr); + free(tr); + free(mr); + } else if (je->m_iops || je->t_iops) + p += sprintf(p, ", CR=%d/%d IOPS", je->t_iops, je->m_iops); +#else + gtk_label_set_text(GTK_LABEL(ui.eta.cr_bw), "---"); + gtk_label_set_text(GTK_LABEL(ui.eta.cr_iops), "---"); + gtk_label_set_text(GTK_LABEL(ui.eta.cw_bw), "---"); + gtk_label_set_text(GTK_LABEL(ui.eta.cw_iops), "---"); +#endif + + if (je->eta_sec != INT_MAX && je->nr_running) { + char *iops_str[2]; + char *rate_str[2]; + + if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running) + strcpy(output, "-.-% done"); + else { + eta_good = 1; + perc *= 100.0; + sprintf(output, "%3.1f%% done", perc); + } + + rate_str[0] = num2str(je->rate[0], 5, 10, i2p); + rate_str[1] = num2str(je->rate[1], 5, 10, i2p); + + iops_str[0] = num2str(je->iops[0], 4, 1, 0); + iops_str[1] = num2str(je->iops[1], 4, 1, 0); + + gtk_label_set_text(GTK_LABEL(ui.eta.read_bw), rate_str[0]); + gtk_label_set_text(GTK_LABEL(ui.eta.read_iops), iops_str[0]); + gtk_label_set_text(GTK_LABEL(ui.eta.write_bw), rate_str[1]); + gtk_label_set_text(GTK_LABEL(ui.eta.write_iops), iops_str[1]); + + free(rate_str[0]); + free(rate_str[1]); + free(iops_str[0]); + free(iops_str[1]); + } + + if (eta_str[0]) { + char *dst = output + strlen(output); + + sprintf(dst, " - %s", eta_str); + } + + gfio_update_thread_status(output, perc); +} + static void gfio_eta_op(struct fio_client *client, struct fio_net_cmd *cmd) { - fio_client_ops.eta(client, cmd); + struct jobs_eta *je = (struct jobs_eta *) cmd->payload; + struct client_eta *eta = (struct client_eta *) (uintptr_t) cmd->tag; + + client->eta_in_flight = NULL; + flist_del_init(&client->eta_list); + + fio_client_convert_jobs_eta(je); + fio_client_sum_jobs_eta(&eta->eta, je); + fio_client_dec_jobs_eta(eta, gfio_update_eta); } static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd) { - printf("gfio_probe_op called\n"); - fio_client_ops.probe(client, cmd); + struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload; + const char *os, *arch; + char buf[64]; + + os = fio_get_os_string(probe->os); + if (!os) + os = "unknown"; + + arch = fio_get_arch_string(probe->arch); + if (!arch) + os = "unknown"; + + if (!client->name) + client->name = strdup((char *) probe->hostname); + + gtk_label_set_text(GTK_LABEL(ui.probe.hostname), (char *) probe->hostname); + gtk_label_set_text(GTK_LABEL(ui.probe.os), os); + gtk_label_set_text(GTK_LABEL(ui.probe.arch), arch); + sprintf(buf, "%u.%u.%u", probe->fio_major, probe->fio_minor, probe->fio_patch); + gtk_label_set_text(GTK_LABEL(ui.probe.fio_ver), buf); } static void gfio_update_thread_status(char *status_message, double perc) @@ -134,75 +287,93 @@ static void gfio_update_thread_status(char *status_message, double perc) gdk_threads_leave(); } -struct client_ops gfio_client_ops = { - gfio_text_op, - gfio_disk_util_op, - gfio_thread_status_op, - gfio_group_stats_op, - gfio_eta_op, - gfio_probe_op, - gfio_update_thread_status, -}; - -static void quit_clicked(__attribute__((unused)) GtkWidget *widget, - __attribute__((unused)) gpointer data) +static void gfio_quit_op(struct fio_client *client) { - gtk_main_quit(); -} + struct gui *ui = client->client_data; -static void add_arg(char **argv, int index, const char *value) -{ - argv[index] = malloc(strlen(value) + 1); - strcpy(argv[index], value); + gfio_set_connected(ui, 0); } -static void free_args(int argc, char **argv) +static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) { + struct cmd_add_job_pdu *p = (struct cmd_add_job_pdu *) cmd->payload; + struct gui *ui = client->client_data; + char tmp[8]; int i; - for (i = 0; i < argc; i++) - free(argv[i]); - free(argv); + p->iodepth = le32_to_cpu(p->iodepth); + p->rw = le32_to_cpu(p->rw); + + for (i = 0; i < 2; i++) { + p->min_bs[i] = le32_to_cpu(p->min_bs[i]); + p->max_bs[i] = le32_to_cpu(p->max_bs[i]); + } + + p->numjobs = le32_to_cpu(p->numjobs); + p->group_reporting = le32_to_cpu(p->group_reporting); + + gtk_label_set_text(GTK_LABEL(ui->eta.name), (gchar *) p->jobname); + gtk_label_set_text(GTK_LABEL(ui->eta.iotype), ddir_str(p->rw)); + gtk_label_set_text(GTK_LABEL(ui->eta.ioengine), (gchar *) p->ioengine); + + sprintf(tmp, "%u", p->iodepth); + gtk_label_set_text(GTK_LABEL(ui->eta.iodepth), tmp); } -static void *job_thread(void *arg) +struct client_ops gfio_client_ops = { + .text_op = gfio_text_op, + .disk_util = gfio_disk_util_op, + .thread_status = gfio_thread_status_op, + .group_stats = gfio_group_stats_op, + .eta = gfio_eta_op, + .probe = gfio_probe_op, + .quit = gfio_quit_op, + .add_job = gfio_add_job_op, + .stay_connected = 1, +}; + +static void quit_clicked(__attribute__((unused)) GtkWidget *widget, + __attribute__((unused)) gpointer data) { - struct gui *ui = arg; + gtk_main_quit(); +} +static void *job_thread(void *arg) +{ + printf("job thread starts\n"); fio_handle_clients(&gfio_client_ops); - gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 1); - free_args(ui->argc, ui->argv); + printf("job thread exits\n"); return NULL; } -static void construct_options(struct gui *ui, int *argc, char ***argv) +static int send_job_files(struct gui *ui) { - const char *hostname, *hostname_type, *port, *jobfile; - char newarg[200]; - - hostname_type = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(ui->hostname_combo_box)->entry)); - hostname = gtk_entry_get_text(GTK_ENTRY(ui->hostname_entry)); - port = gtk_entry_get_text(GTK_ENTRY(ui->port_entry)); - jobfile = gtk_entry_get_text(GTK_ENTRY(ui->jobfile_entry)); - - *argc = 3; - *argv = malloc(*argc * sizeof(**argv)); - add_arg(*argv, 0, "gfio"); - snprintf(newarg, sizeof(newarg) - 1, "--client=%s", hostname); - add_arg(*argv, 1, newarg); - add_arg(*argv, 2, jobfile); + int i, ret = 0; + + for (i = 0; i < ui->nr_job_files; i++) { + ret = fio_clients_send_ini(ui->job_files[i]); + if (ret) + break; + + free(ui->job_files[i]); + ui->job_files[i] = NULL; + } + while (i < ui->nr_job_files) { + free(ui->job_files[i]); + ui->job_files[i] = NULL; + i++; + } + + return ret; } -static void start_job_thread(pthread_t *t, struct gui *ui) +static void start_job_thread(struct gui *ui) { - construct_options(ui, &ui->argc, &ui->argv); - if (parse_options(ui->argc, ui->argv)) { + if (send_job_files(ui)) { printf("Yeah, I didn't really like those options too much.\n"); - free_args(ui->argc, ui->argv); gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 1); return; } - pthread_create(t, NULL, job_thread, ui); } static void start_job_clicked(__attribute__((unused)) GtkWidget *widget, @@ -210,9 +381,21 @@ static void start_job_clicked(__attribute__((unused)) GtkWidget *widget, { struct gui *ui = data; - printf("Start job button was clicked.\n"); gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 0); - start_job_thread(&ui->t, ui); + start_job_thread(ui); +} + +static void connect_clicked(__attribute__((unused)) GtkWidget *widget, + gpointer data) +{ + struct gui *ui = data; + + if (!ui->connected) { + fio_clients_connect(); + pthread_create(&ui->t, NULL, job_thread, NULL); + gfio_set_connected(ui, 1); + } else + gfio_set_connected(ui, 0); } static void add_button(struct gui *ui, int i, GtkWidget *buttonbox, @@ -220,8 +403,9 @@ static void add_button(struct gui *ui, int i, GtkWidget *buttonbox, { ui->button[i] = gtk_button_new_with_label(buttonspec->buttontext); g_signal_connect(ui->button[i], "clicked", G_CALLBACK (buttonspec->f), ui); - gtk_box_pack_start(GTK_BOX (ui->buttonbox), ui->button[i], TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX (ui->buttonbox), ui->button[i], FALSE, FALSE, 3); gtk_widget_set_tooltip_text(ui->button[i], buttonspeclist[i].tooltiptext); + gtk_widget_set_sensitive(ui->button[i], !buttonspec->start_insensitive); } static void add_buttons(struct gui *ui, @@ -234,10 +418,243 @@ static void add_buttons(struct gui *ui, add_button(ui, i, ui->buttonbox, &buttonlist[i]); } +static void on_info_bar_response(GtkWidget *widget, gint response, + gpointer data) +{ + if (response == GTK_RESPONSE_OK) { + gtk_widget_destroy(widget); + ui.error_info_bar = NULL; + } +} + +void report_error(GError* error) +{ + if (ui.error_info_bar == NULL) { + ui.error_info_bar = gtk_info_bar_new_with_buttons(GTK_STOCK_OK, + GTK_RESPONSE_OK, + NULL); + g_signal_connect(ui.error_info_bar, "response", G_CALLBACK(on_info_bar_response), NULL); + gtk_info_bar_set_message_type(GTK_INFO_BAR(ui.error_info_bar), + GTK_MESSAGE_ERROR); + + ui.error_label = gtk_label_new(error->message); + GtkWidget *container = gtk_info_bar_get_content_area(GTK_INFO_BAR(ui.error_info_bar)); + gtk_container_add(GTK_CONTAINER(container), ui.error_label); + + gtk_box_pack_start(GTK_BOX(ui.vbox), ui.error_info_bar, FALSE, FALSE, 0); + gtk_widget_show_all(ui.vbox); + } else { + char buffer[256]; + snprintf(buffer, sizeof(buffer), "Failed to open file."); + gtk_label_set(GTK_LABEL(ui.error_label), buffer); + } +} + +static void file_open(GtkWidget *w, gpointer 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, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE); + + filter = gtk_file_filter_new(); + gtk_file_filter_add_pattern(filter, "*.fio"); + gtk_file_filter_add_pattern(filter, "*.job"); + gtk_file_filter_add_mime_type(filter, "text/fio"); + gtk_file_filter_set_name(filter, "Fio job file"); + gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + gtk_widget_destroy(dialog); + return; + } + + fn_glist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); + filenames = fn_glist; + while (filenames != NULL) { + const char *hostname; + char *typeentry; + gint port; + int type; + + ui.job_files = realloc(ui.job_files, (ui.nr_job_files + 1) * sizeof(char *)); + ui.job_files[ui.nr_job_files] = strdup(filenames->data); + ui.nr_job_files++; + + hostname = gtk_entry_get_text(GTK_ENTRY(ui.hostname_entry)); + port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(ui.port_button)); + typeentry = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(ui.hostname_combo_box)); + if (!typeentry || !strncmp(typeentry, "IPv4", 4)) + type = Fio_client_ipv4; + else if (!strncmp(typeentry, "IPv6", 4)) + type = Fio_client_ipv6; + else + type = Fio_client_socket; + g_free(typeentry); + + ui.client = fio_client_add_explicit(hostname, type, port); + ui.client->client_data = &ui; +#if 0 + if (error) { + report_error(error); + g_error_free(error); + error = NULL; + } +#endif + + g_free(filenames->data); + filenames = g_slist_next(filenames); + } + g_slist_free(fn_glist); + gtk_widget_destroy(dialog); +} + +static void file_save(GtkWidget *w, gpointer data) +{ + GtkWidget *dialog; + + dialog = gtk_file_chooser_dialog_new("Save File", + GTK_WINDOW(ui.window), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), "Untitled document"); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + char *filename; + + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + // save_job_file(filename); + g_free(filename); + } + gtk_widget_destroy(dialog); +} + +static void about_dialog(GtkWidget *w, gpointer data) +{ + gtk_show_about_dialog(NULL, + "program-name", "gfio", + "comments", "Gtk2 UI for fio", + "license", "GPLv2", + "version", fio_version_string, + "copyright", "Jens Axboe 2012", + "logo-icon-name", "fio", + /* Must be last: */ + NULL, NULL, + NULL); +} + +static GtkActionEntry menu_items[] = { + { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, + { "HelpMenuAction", GTK_STOCK_HELP, "Help", NULL, NULL, NULL}, + { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, + { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, + { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit_clicked) }, + { "About", GTK_STOCK_ABOUT, NULL, NULL, NULL, G_CALLBACK(about_dialog) }, +}; +static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); + +static const gchar *ui_string = " \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +"; + +static GtkWidget *get_menubar_menu(GtkWidget *window, GtkUIManager *ui_manager) +{ + GtkActionGroup *action_group = gtk_action_group_new("Menu"); + GError *error = 0; + + action_group = gtk_action_group_new("Menu"); + gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0); + + gtk_ui_manager_insert_action_group(ui_manager, action_group, 0); + 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"); +} + +void gfio_ui_setup(GtkSettings *settings, GtkWidget *menubar, + GtkWidget *vbox, GtkUIManager *ui_manager) +{ + gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); +} + +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_text_entry(GtkWidget *hbox, GtkWidget *label, const char *defval) +{ + GtkWidget *text, *box; + + gtk_container_add(GTK_CONTAINER(hbox), label); + + box = gtk_hbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(hbox), box); + + text = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(box), text, TRUE, TRUE, 0); + gtk_entry_set_text(GTK_ENTRY(text), "localhost"); + + return text; +} + +static GtkWidget *create_spinbutton(GtkWidget *hbox, GtkWidget *label, double min, double max, double defval) +{ + GtkWidget *button, *box; + + gtk_container_add(GTK_CONTAINER(hbox), label); + + 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 init_ui(int *argc, char **argv[], struct gui *ui) { - GList *hostname_type_list = NULL; - char portnum[20]; + GtkSettings *settings; + GtkUIManager *uimanager; + GtkWidget *menu, *probe, *probe_frame, *probe_box; + + memset(ui, 0, sizeof(*ui)); /* Magical g*thread incantation, you just need this thread stuff. * Without it, the update that happens in gfio_update_thread_status @@ -248,23 +665,30 @@ static void init_ui(int *argc, char **argv[], struct gui *ui) gdk_threads_init(); gtk_init(argc, argv); + settings = gtk_settings_get_default(); + gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "gfio setting"); + g_type_init(); ui->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(ui->window), "fio"); gtk_window_set_default_size(GTK_WINDOW(ui->window), 700, 500); - g_signal_connect(ui->window, "delete-event", G_CALLBACK (quit_clicked), NULL); - g_signal_connect(ui->window, "destroy", G_CALLBACK (quit_clicked), NULL); + g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), NULL); + g_signal_connect(ui->window, "destroy", G_CALLBACK(quit_clicked), NULL); 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); + gfio_ui_setup(settings, menu, ui->vbox, uimanager); + /* * Set up alignments for widgets at the top of ui, * align top left, expand horizontally but not vertically */ ui->topalign = gtk_alignment_new(0, 0, 1, 0); - ui->topvbox = gtk_vbox_new(FALSE, 0); + ui->topvbox = gtk_vbox_new(FALSE, 3); gtk_container_add(GTK_CONTAINER(ui->topalign), ui->topvbox); gtk_box_pack_start(GTK_BOX(ui->vbox), ui->topalign, FALSE, FALSE, 0); @@ -272,51 +696,67 @@ static void init_ui(int *argc, char **argv[], struct gui *ui) * Set up hostname label + entry, port label + entry, */ ui->hostname_hbox = gtk_hbox_new(FALSE, 0); - ui->hostname_label = gtk_label_new("Host:"); - ui->hostname_entry = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(ui->hostname_entry), "localhost"); + + ui->hostname_label = gtk_label_new("Hostname:"); + ui->hostname_entry = create_text_entry(ui->hostname_hbox, ui->hostname_label, "localhost"); + ui->port_label = gtk_label_new("Port:"); - ui->port_entry = gtk_entry_new(); - snprintf(portnum, sizeof(portnum) - 1, "%d", FIO_NET_PORT); - gtk_entry_set_text(GTK_ENTRY(ui->port_entry), (gchar *) portnum); + ui->port_button = create_spinbutton(ui->hostname_hbox, ui->port_label, 1, 65535, FIO_NET_PORT); /* * Set up combo box for address type */ - ui->hostname_combo_box = gtk_combo_new(); - gtk_entry_set_text(GTK_ENTRY (GTK_COMBO(ui->hostname_combo_box)->entry), "IPv4"); - hostname_type_list = g_list_append(hostname_type_list, (gpointer) "IPv4"); - hostname_type_list = g_list_append(hostname_type_list, (gpointer) "local socket"); - hostname_type_list = g_list_append(hostname_type_list, (gpointer) "IPv6"); - gtk_combo_set_popdown_strings (GTK_COMBO (ui->hostname_combo_box), hostname_type_list); - g_list_free(hostname_type_list); - - gtk_container_add(GTK_CONTAINER (ui->hostname_hbox), ui->hostname_label); - gtk_container_add(GTK_CONTAINER (ui->hostname_hbox), ui->hostname_entry); - gtk_container_add(GTK_CONTAINER (ui->hostname_hbox), ui->port_label); - gtk_container_add(GTK_CONTAINER (ui->hostname_hbox), ui->port_entry); - gtk_container_add(GTK_CONTAINER (ui->hostname_hbox), ui->hostname_combo_box); - gtk_container_add(GTK_CONTAINER (ui->topvbox), ui->hostname_hbox); + ui->hostname_combo_box = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ui->hostname_combo_box), "IPv4"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ui->hostname_combo_box), "IPv6"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ui->hostname_combo_box), "local socket"); + gtk_combo_box_set_active(GTK_COMBO_BOX(ui->hostname_combo_box), 0); + + gtk_container_add(GTK_CONTAINER(ui->hostname_hbox), ui->hostname_combo_box); + gtk_container_add(GTK_CONTAINER(ui->topvbox), ui->hostname_hbox); + + probe = gtk_frame_new("Job"); + gtk_box_pack_start(GTK_BOX(ui->topvbox), probe, TRUE, FALSE, 3); + probe_frame = gtk_vbox_new(FALSE, 3); + gtk_container_add(GTK_CONTAINER(probe), probe_frame); + + probe_box = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, TRUE, FALSE, 3); + ui->probe.hostname = new_info_label_in_frame(probe_box, "Host"); + ui->probe.os = new_info_label_in_frame(probe_box, "OS"); + ui->probe.arch = new_info_label_in_frame(probe_box, "Architecture"); + ui->probe.fio_ver = new_info_label_in_frame(probe_box, "Fio version"); + + probe_box = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, TRUE, FALSE, 3); + + ui->eta.name = new_info_label_in_frame(probe_box, "Name"); + ui->eta.iotype = new_info_label_in_frame(probe_box, "IO"); + ui->eta.ioengine = new_info_label_in_frame(probe_box, "IO Engine"); + ui->eta.iodepth = new_info_label_in_frame(probe_box, "IO Depth"); + ui->eta.jobs = new_info_label_in_frame(probe_box, "Jobs"); + ui->eta.files = new_info_label_in_frame(probe_box, "Open files"); + + probe_box = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, TRUE, FALSE, 3); + ui->eta.read_bw = new_info_label_in_frame(probe_box, "Read BW"); + ui->eta.read_iops = new_info_label_in_frame(probe_box, "IOPS"); + ui->eta.write_bw = new_info_label_in_frame(probe_box, "Write BW"); + ui->eta.write_iops = new_info_label_in_frame(probe_box, "IOPS"); /* - * Set up jobfile text entry (temporary until gui really works) + * Only add this if we have a commit rate */ - ui->jobfile_hbox = gtk_hbox_new(FALSE, 0); - ui->jobfile_label = gtk_label_new("Job file:"); - ui->jobfile_entry = gtk_entry_new(); - gtk_container_add(GTK_CONTAINER (ui->jobfile_hbox), ui->jobfile_label); - gtk_container_add(GTK_CONTAINER (ui->jobfile_hbox), ui->jobfile_entry); - gtk_container_add(GTK_CONTAINER (ui->topvbox), ui->jobfile_hbox); +#if 0 + probe_box = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, TRUE, FALSE, 3); - /* - * Set up thread status progress bar - */ - ui->thread_status_pb = gtk_progress_bar_new(); - gtk_progress_bar_set_fraction( - GTK_PROGRESS_BAR(ui->thread_status_pb), 0.0); - gtk_progress_bar_set_text( - GTK_PROGRESS_BAR(ui->thread_status_pb), "No jobs running"); - gtk_container_add(GTK_CONTAINER (ui->topvbox), ui->thread_status_pb); + ui->eta.cr_bw = new_info_label_in_frame(probe_box, "Commit BW"); + ui->eta.cr_iops = new_info_label_in_frame(probe_box, "Commit IOPS"); + + ui->eta.cw_bw = new_info_label_in_frame(probe_box, "Commit BW"); + ui->eta.cw_iops = new_info_label_in_frame(probe_box, "Commit IOPS"); +#endif /* * Add a text box for text op messages @@ -344,6 +784,16 @@ static void init_ui(int *argc, char **argv[], struct gui *ui) FALSE, FALSE, 0); add_buttons(ui, buttonspeclist, ARRAYSIZE(buttonspeclist)); + + /* + * Set up thread status progress bar + */ + ui->thread_status_pb = gtk_progress_bar_new(); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), 0.0); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), "No jobs running"); + gtk_container_add(GTK_CONTAINER(ui->buttonbox), ui->thread_status_pb); + + gtk_widget_show_all(ui->window); } @@ -351,7 +801,10 @@ int main(int argc, char *argv[], char *envp[]) { if (initialize_fio(envp)) return 1; + if (fio_init_options()) + return 1; + fio_debug = ~0UL; init_ui(&argc, &argv, &ui); gdk_threads_enter();