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);
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 {
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;
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);
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.
{
unsigned int connect_state, send_state, start_state, edit_state;
const char *connect_str = NULL;
- GtkWidget *w;
switch (ge->state) {
default: {
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)
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,
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];
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);
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:
#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" };
}
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));
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);
+
+ frame = gtk_frame_new("Latency buckets");
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
- 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);
- }
+ 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)
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", "<Control>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 = " \
+ <ui> \
+ <menubar name=\"MainMenu\"> \
+ <menu name=\"FileMenu\" action=\"FileMenuAction\"> \
+ <menuitem name=\"Close\" action=\"CloseFile\" /> \
+ </menu> \
+ <menu name=\"GraphMenu\" action=\"GraphMenuAction\"> \
+ </menu>\
+ </menubar> \
+ </ui> \
+";
+
+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;
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 int __gfio_disk_util_show(GtkWidget *res_notebook,
+ struct gfio_client *gc, struct cmd_du_pdu *p)
+{
+ GtkWidget *box, *frame, *entry, *vbox;
+ struct gui_entry *ge = gc->ge;
+ double util;
+ char tmp[16];
+
+ res_notebook = get_results_window(ge);
+
+ if (!ge->disk_util_vbox) {
+ vbox = gtk_vbox_new(FALSE, 3);
+ gtk_notebook_append_page(GTK_NOTEBOOK(res_notebook), vbox, gtk_label_new("Disk utilization"));
+ ge->disk_util_vbox = vbox;
+ g_signal_connect(vbox, "destroy", G_CALLBACK(disk_util_destroy), ge);
+ }
+
+ vbox = gtk_vbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(ge->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);
+
+ 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);
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);
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;
+
+ gfio_add_end_results(gc, ts, rs);
+
+ gdk_threads_enter();
+ gfio_display_end_results(gc);
gdk_threads_leave();
}
{
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();
+ unsigned int nr = gc->nr_du;
- 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);
+ gc->du = realloc(gc->du, (nr + 1) * sizeof(struct cmd_du_pdu));
+ memcpy(&gc->du[nr], p, sizeof(*p));
+ gc->nr_du++;
- 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(gc->results_widget);
-out:
+ gdk_threads_enter();
+ gfio_disk_util_show(gc);
gdk_threads_leave();
}
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) {
struct gui_entry *ge = gc->ge;
char tmp[8];
+ 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();
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);
}
static void ge_widget_destroy(GtkWidget *w, gpointer data)
{
- struct gui_entry *ge = data;
-
- /*
- * Why are we getting NULL data here sometimes?
- */
- if (ge)
- ge_destroy(ge);
}
static void gfio_quit(struct gui *ui)
}
}
-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)
{
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);
{ "SaveFile", GTK_STOCK_SAVE, NULL, "<Control>S", NULL, G_CALLBACK(file_save) },
{ "Preferences", GTK_STOCK_PREFERENCES, NULL, "<Control>p", NULL, G_CALLBACK(preferences) },
{ "ViewLog", NULL, "Log", "<Control>l", NULL, G_CALLBACK(view_log) },
+ { "ViewResults", NULL, "Results", "<Control>R", NULL, G_CALLBACK(view_results) },
{ "ConnectJob", NULL, "Connect", "<Control>E", NULL, G_CALLBACK(connect_job_entry) },
{ "EditJob", NULL, "Edit job", "<Control>E", NULL, G_CALLBACK(edit_job_entry) },
{ "SendJob", NULL, "Send job", "<Control>X", NULL, G_CALLBACK(send_job_entry) },
<menubar name=\"MainMenu\"> \
<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
<menuitem name=\"New\" action=\"NewFile\" /> \
+ <menuitem name=\"Open\" action=\"OpenFile\" /> \
<menuitem name=\"Close\" action=\"CloseFile\" /> \
<separator name=\"Separator1\"/> \
- <menuitem name=\"Open\" action=\"OpenFile\" /> \
<menuitem name=\"Save\" action=\"SaveFile\" /> \
<separator name=\"Separator2\"/> \
<menuitem name=\"Preferences\" action=\"Preferences\" /> \
<menuitem name=\"Start job\" action=\"StartJob\" /> \
</menu>\
<menu name=\"ViewMenu\" action=\"ViewMenuAction\"> \
+ <menuitem name=\"Results\" action=\"ViewResults\" /> \
+ <separator name=\"Separator7\"/> \
<menuitem name=\"Log\" action=\"ViewLog\" /> \
</menu>\
<menu name=\"Help\" action=\"HelpMenuAction\"> \
</ui> \
";
-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");
{
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);
/*
* 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);
{
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);
/*
* 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);
if (!page) {
set_job_menu_visible(ui, 0);
+ set_view_results_visible(ui, 0);
return TRUE;
}
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);
projects / fio.git / blobdiff