X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=4bc3a3e663f3cead732b5b25bd601d5667c50e49;hp=13e3684bf5ad3ce36b11f3a64877a3922ab52390;hb=16ce5adf97de087c4c5220f6800bf310a3a70045;hpb=0aa928c49991d100f28aa75116be0036c90ebaa4 diff --git a/gfio.c b/gfio.c index 13e3684b..4bc3a3e6 100644 --- a/gfio.c +++ b/gfio.c @@ -34,6 +34,7 @@ static int gfio_server_running; static const char *gfio_graph_font; +static unsigned int gfio_graph_limit = 100; static void view_log(GtkWidget *w, gpointer data); @@ -67,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 *name; - GtkWidget *iotype; - GtkWidget *ioengine; - GtkWidget *iodepth; + GtkWidget *names; + struct multitext_widget iotype; + struct multitext_widget ioengine; + struct multitext_widget iodepth; GtkWidget *jobs; GtkWidget *files; GtkWidget *read_bw; @@ -88,9 +96,6 @@ struct gfio_graphs { #define DRAWING_AREA_XDIM 1000 #define DRAWING_AREA_YDIM 400 GtkWidget *drawing_area; - int drawing_area_xdim; - int drawing_area_ydim; - struct graph *iops_graph; struct graph *bandwidth_graph; }; @@ -135,6 +140,7 @@ struct gui_entry { GtkWidget *topvbox; GtkWidget *topalign; GtkWidget *bottomalign; + GtkWidget *job_notebook; GtkWidget *thread_status_pb; GtkWidget *buttonbox; GtkWidget *button[ARRAYSIZE(buttonspeclist)]; @@ -173,6 +179,21 @@ static void gfio_update_thread_status(struct gui_entry *ge, char *status_message 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; @@ -185,10 +206,27 @@ static struct graph *setup_iops_graph(void) 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, 100); + 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); 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; @@ -202,6 +240,9 @@ static struct graph *setup_bandwidth_graph(void) graph_set_color(g, "Read Bandwidth", 0.13, 0.54, 0.13); graph_set_color(g, "Write Bandwidth", 1.0, 0.0, 0.0); 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); + return g; } @@ -211,16 +252,67 @@ 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), ""); gtk_label_set_text(GTK_LABEL(ge->probe.os), ""); gtk_label_set_text(GTK_LABEL(ge->probe.arch), ""); gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), ""); +#if 0 + /* should we empty it... */ gtk_entry_set_text(GTK_ENTRY(ge->eta.name), ""); - 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), ""); +#endif + 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), ""); @@ -229,6 +321,18 @@ 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; @@ -303,6 +407,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 @@ -1082,35 +1204,28 @@ static gint on_config_drawing_area(GtkWidget *w, GdkEventConfigure *event, { struct gfio_graphs *g = data; - g->drawing_area_xdim = w->allocation.width; - g->drawing_area_ydim = w->allocation.height; + graph_set_size(g->iops_graph, w->allocation.width / 2.0, w->allocation.height); + graph_set_position(g->iops_graph, w->allocation.width / 2.0, 0.0); + graph_set_size(g->bandwidth_graph, w->allocation.width / 2.0, w->allocation.height); + graph_set_position(g->bandwidth_graph, 0, 0); return TRUE; } +static void draw_graph(struct graph *g, cairo_t *cr) +{ + line_graph_draw(g, cr); + cairo_stroke(cr); +} + static int on_expose_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p) { struct gfio_graphs *g = p; cairo_t *cr; - graph_set_size(g->iops_graph, g->drawing_area_xdim / 2.0, - g->drawing_area_ydim); - graph_set_size(g->bandwidth_graph, g->drawing_area_xdim / 2.0, - g->drawing_area_ydim); cr = gdk_cairo_create(w->window); - cairo_set_source_rgb(cr, 0, 0, 0); - - cairo_save(cr); - cairo_translate(cr, 0, 0); - line_graph_draw(g->bandwidth_graph, cr); - cairo_stroke(cr); - cairo_restore(cr); - - cairo_save(cr); - cairo_translate(cr, g->drawing_area_xdim / 2.0, 0); - line_graph_draw(g->iops_graph, cr); - cairo_stroke(cr); - cairo_restore(cr); + draw_graph(g->iops_graph, cr); + draw_graph(g->bandwidth_graph, cr); cairo_destroy(cr); return FALSE; @@ -1251,6 +1366,8 @@ static void gfio_update_all_eta(struct jobs_eta *je) gtk_entry_set_text(GTK_ENTRY(ui->eta.cw_iops), "---"); #endif + entry_set_int_value(ui->eta.jobs, je->nr_running); + if (je->eta_sec != INT_MAX && je->nr_running) { char *iops_str[2]; char *rate_str[2]; @@ -1374,12 +1491,18 @@ static void gfio_add_job_op(struct fio_client *client, struct fio_net_cmd *cmd) gtk_label_set_text(GTK_LABEL(ge->page_label), (gchar *) o->name); - gtk_entry_set_text(GTK_ENTRY(ge->eta.name), (gchar *) o->name); - 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); + 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)); + 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++; @@ -1389,7 +1512,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(); @@ -1398,22 +1520,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(); } @@ -1444,6 +1551,7 @@ struct client_ops gfio_client_ops = { .add_job = gfio_add_job_op, .timed_out = gfio_client_timed_out, .stop = gfio_client_stop, + .eta_msec = FIO_CLIENT_DEF_ETA_MSEC, .stay_connected = 1, }; @@ -1808,8 +1916,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); @@ -1833,7 +1945,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); } /* @@ -1857,6 +1973,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; @@ -2002,9 +2137,33 @@ 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); + line_graph_set_data_count_limit(g->bandwidth_graph, gfio_graph_limit); +} + +static void update_graph_limits(void) +{ + struct flist_head *entry; + struct gui_entry *ge; + + __update_graph_limits(&main_ui.graphs); + + flist_for_each(entry, &main_ui.list) { + ge = flist_entry(entry, struct gui_entry, list); + __update_graph_limits(&ge->graphs); + } +} + static void preferences(GtkWidget *w, gpointer data) { GtkWidget *dialog, *frame, *box, **buttons, *vbox, *font; + GtkWidget *hbox, *spin, *entry, *spin_int; int i; dialog = gtk_dialog_new_with_buttons("Preferences", @@ -2014,9 +2173,40 @@ static void preferences(GtkWidget *w, gpointer data) GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); - frame = gtk_frame_new("Debug logging"); + frame = gtk_frame_new("Graphing"); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5); + vbox = gtk_vbox_new(FALSE, 6); + gtk_container_add(GTK_CONTAINER(frame), vbox); + + hbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); + entry = gtk_label_new("Font face to use for graph labels"); + gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 5); + font = gtk_font_button_new(); + gtk_box_pack_start(GTK_BOX(hbox), font, FALSE, FALSE, 5); + + box = gtk_vbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5); + + hbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, TRUE, 5); + entry = gtk_label_new("Maximum number of data points in graph (seconds)"); + gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); + + spin = create_spinbutton(hbox, 10, 1000000, gfio_graph_limit); + + box = gtk_vbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5); + + hbox = gtk_hbox_new(FALSE, 5); + gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, TRUE, 5); + entry = gtk_label_new("Client ETA request interval (msec)"); + gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5); + + spin_int = create_spinbutton(hbox, 100, 100000, gfio_client_ops.eta_msec); + frame = gtk_frame_new("Debug logging"); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5); vbox = gtk_vbox_new(FALSE, 6); gtk_container_add(GTK_CONTAINER(frame), vbox); @@ -2037,14 +2227,6 @@ static void preferences(GtkWidget *w, gpointer data) gtk_box_pack_start(GTK_BOX(box), buttons[i], FALSE, FALSE, 6); } - frame = gtk_frame_new("Graph font"); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5); - vbox = gtk_vbox_new(FALSE, 6); - gtk_container_add(GTK_CONTAINER(frame), vbox); - - font = gtk_font_button_new(); - gtk_box_pack_start(GTK_BOX(vbox), font, FALSE, FALSE, 5); - gtk_widget_show_all(dialog); if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { @@ -2061,6 +2243,10 @@ static void preferences(GtkWidget *w, gpointer data) } gfio_graph_font = strdup(gtk_font_button_get_font_name(GTK_FONT_BUTTON(font))); + gfio_graph_limit = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin)); + update_graph_limits(); + gfio_client_ops.eta_msec = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_int)); + gtk_widget_destroy(dialog); } @@ -2108,12 +2294,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) }, }; @@ -2124,6 +2313,7 @@ static const gchar *ui_string = " \ \ \ \ + \ \ \ \ @@ -2132,6 +2322,9 @@ static const gchar *ui_string = " \ \ \ \ + \ + \ + \ \ \ \ @@ -2164,6 +2357,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; @@ -2191,10 +2405,12 @@ static GtkWidget *new_client_page(struct gui_entry *ge) probe_box = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3); - ge->eta.name = new_info_entry_in_frame(probe_box, "Name"); - 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"); + ge->eta.names = new_combo_entry_in_frame(probe_box, "Jobs"); + 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"); @@ -2224,10 +2440,8 @@ static GtkWidget *new_client_page(struct gui_entry *ge) */ gdk_color_parse("white", &white); ge->graphs.drawing_area = gtk_drawing_area_new(); - ge->graphs.drawing_area_xdim = DRAWING_AREA_XDIM; - ge->graphs.drawing_area_ydim = DRAWING_AREA_YDIM; gtk_widget_set_size_request(GTK_WIDGET(ge->graphs.drawing_area), - ge->graphs.drawing_area_xdim, ge->graphs.drawing_area_ydim); + DRAWING_AREA_XDIM, DRAWING_AREA_YDIM); gtk_widget_modify_bg(ge->graphs.drawing_area, GTK_STATE_NORMAL, &white); g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "expose_event", G_CALLBACK(on_expose_drawing_area), &ge->graphs); @@ -2290,6 +2504,7 @@ static GtkWidget *new_main_page(struct gui *ui) probe_box = gtk_hbox_new(FALSE, 3); gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3); + ui->eta.jobs = new_info_entry_in_frame(probe_box, "Running"); ui->eta.read_bw = new_info_entry_in_frame(probe_box, "Read BW"); ui->eta.read_iops = new_info_entry_in_frame(probe_box, "IOPS"); ui->eta.write_bw = new_info_entry_in_frame(probe_box, "Write BW"); @@ -2314,10 +2529,8 @@ static GtkWidget *new_main_page(struct gui *ui) */ gdk_color_parse("white", &white); ui->graphs.drawing_area = gtk_drawing_area_new(); - ui->graphs.drawing_area_xdim = DRAWING_AREA_XDIM; - ui->graphs.drawing_area_ydim = DRAWING_AREA_YDIM; gtk_widget_set_size_request(GTK_WIDGET(ui->graphs.drawing_area), - ui->graphs.drawing_area_xdim, ui->graphs.drawing_area_ydim); + DRAWING_AREA_XDIM, DRAWING_AREA_YDIM); gtk_widget_modify_bg(ui->graphs.drawing_area, GTK_STATE_NORMAL, &white); g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "expose_event", G_CALLBACK(on_expose_drawing_area), &ui->graphs);