#include <gtk/gtk.h>
#include "fio.h"
+#include "gfio.h"
+#include "ghelpers.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;
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);
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, { "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", NULL }, 0 },
-};
-
-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_window;
- GtkWidget *results_notebook;
- GtkUIManager *results_uimanager;
- GtkWidget *results_menu;
- GtkWidget *disk_util_vbox;
- 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 *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;
+ {
+ .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);
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), "");
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)
{
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_tooltip_text(ge->button[CONNECT_BUTTON], get_button_tooltip(&buttonspeclist[CONNECT_BUTTON], connect_state));
+ 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);
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, TRUE, 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;
+ GtkWidget *box, *frame, *entry, *vbox, *util_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);
- }
+ util_vbox = gfio_disk_util_get_vbox(ge);
vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(ge->disk_util_vbox), vbox);
+ 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);
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();
}
{
struct cmd_du_pdu *p = (struct cmd_du_pdu *) cmd->payload;
struct gfio_client *gc = client->client_data;
+ struct gui_entry *ge = gc->ge;
unsigned int nr = gc->nr_du;
gc->du = realloc(gc->du, (nr + 1) * sizeof(struct cmd_du_pdu));
gc->nr_du++;
gdk_threads_enter();
- gfio_disk_util_show(gc);
+ if (ge->results_window)
+ __gfio_disk_util_show(ge->results_notebook, gc, p);
+ else
+ gfio_disk_util_show(gc);
gdk_threads_leave();
}
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);
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();
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);
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);
}
}
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);
}
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);
}
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");
projects / fio.git / blobdiff