Fix reversal of IOPS and BW graphs
[fio.git] / gfio.c
diff --git a/gfio.c b/gfio.c
index 4d9d73da2ab376d6f7e23b6de5a4c36a3d4726f8..b91ef064b2281256ddc0141f4d5aec3d51b1108a 100644 (file)
--- a/gfio.c
+++ b/gfio.c
  */
 #include <locale.h>
 #include <malloc.h>
+#include <string.h>
 
 #include <glib.h>
 #include <cairo.h>
 #include <gtk/gtk.h>
 
 #include "fio.h"
+#include "gfio.h"
+#include "ghelpers.h"
+#include "goptions.h"
+#include "gerror.h"
+#include "gclient.h"
 #include "graph.h"
 
 static int gfio_server_running;
-static const char *gfio_graph_font;
+static unsigned int gfio_graph_limit = 100;
 
-static void gfio_update_thread_status(char *status_message, double perc);
-
-#define ARRAYSIZE(x) (sizeof((x)) / (sizeof((x)[0])))
+GdkColor gfio_color_white;
+const char *gfio_graph_font;
 
 typedef void (*clickfunction)(GtkWidget *widget, gpointer data);
 
 static void connect_clicked(GtkWidget *widget, gpointer data);
 static void start_job_clicked(GtkWidget *widget, gpointer data);
+static void send_clicked(GtkWidget *widget, 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 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", 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 {
-       GtkWidget *window;
-       GtkWidget *vbox;
-       GtkWidget *topvbox;
-       GtkWidget *topalign;
-       GtkWidget *bottomalign;
-       GtkWidget *thread_status_pb;
-       GtkWidget *buttonbox;
-       GtkWidget *button[ARRAYSIZE(buttonspeclist)];
-       GtkWidget *scrolled_window;
-#define DRAWING_AREA_XDIM 1000
-#define DRAWING_AREA_YDIM 400
-       GtkWidget *drawing_area;
-       GtkWidget *error_info_bar;
-       GtkWidget *error_label;
-       GtkWidget *results_notebook;
-       GtkWidget *results_window;
-       GtkListStore *log_model;
-       GtkWidget *log_tree;
-       GtkWidget *log_view;
-       GtkTextBuffer *text;
-       struct probe_widget probe;
-       struct eta_widget eta;
-       int connected;
-       pthread_t t;
-       pthread_t server_t;
-
-       struct graph *iops_graph;
-       struct graph *bandwidth_graph;
-       struct fio_client *client;
-       int nr_job_files;
-       char **job_files;
-} ui;
-
-struct gfio_client {
-       struct gui *ui;
-       GtkWidget *results_widget;
-       GtkWidget *disk_util_frame;
+       {
+         .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 add_invisible_data(struct graph *g)
+static void setup_iops_graph(struct gfio_graphs *gg)
 {
-       /*
-        * This puts some invisible data into a graph so that it will
-        * initially have some grid lines instead of "No good data"
-        */
-       graph_add_label(g, "invisible");
-       graph_set_color(g, "invisible", INVISIBLE_COLOR, 0.0, 0.7);
-       graph_add_xy_data(g, "invisible", 0.0, 0.0);
-       graph_add_xy_data(g, "invisible", 1.0, 100.0);
+       struct graph *g;
+
+       g = graph_new(DRAWING_AREA_XDIM / 2.0, DRAWING_AREA_YDIM, gfio_graph_font);
+       graph_title(g, "IOPS (IOs/sec)");
+       graph_x_title(g, "Time (secs)");
+       gg->read_iops = graph_add_label(g, "Read IOPS");
+       gg->write_iops = graph_add_label(g, "Write IOPS");
+       graph_set_color(g, gg->read_iops, 0.13, 0.54, 0.13);
+       graph_set_color(g, gg->write_iops, 1.0, 0.0, 0.0);
+       line_graph_set_data_count_limit(g, gfio_graph_limit);
+       graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0);
+       graph_set_graph_all_zeroes(g, 0);
+       gg->iops_graph = g;
 }
 
-static void setup_iops_graph(struct gui *ui)
+static void setup_bandwidth_graph(struct gfio_graphs *gg)
 {
-       if (ui->iops_graph)
-               graph_free(ui->iops_graph);
-       ui->iops_graph = graph_new(DRAWING_AREA_XDIM / 2.0,
-                                       DRAWING_AREA_YDIM, gfio_graph_font);
-       graph_title(ui->iops_graph, "IOPS");
-       graph_x_title(ui->iops_graph, "Time (secs)");
-       graph_add_label(ui->iops_graph, "Read IOPS");
-       graph_add_label(ui->iops_graph, "Write IOPS");
-       graph_set_color(ui->iops_graph, "Read IOPS", 0.13, 0.54, 0.13);
-       graph_set_color(ui->iops_graph, "Write IOPS", 1.0, 0.0, 0.0);
-       add_invisible_data(ui->iops_graph);
+       struct graph *g;
+
+       g = graph_new(DRAWING_AREA_XDIM / 2.0, DRAWING_AREA_YDIM, gfio_graph_font);
+       graph_title(g, "Bandwidth (bytes/sec)");
+       graph_x_title(g, "Time (secs)");
+       gg->read_bw = graph_add_label(g, "Read Bandwidth");
+       gg->write_bw = graph_add_label(g, "Write Bandwidth");
+       graph_set_color(g, gg->read_bw, 0.13, 0.54, 0.13);
+       graph_set_color(g, gg->write_bw, 1.0, 0.0, 0.0);
+       graph_set_base_offset(g, 1);
+       line_graph_set_data_count_limit(g, 100);
+       graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0);
+       graph_set_graph_all_zeroes(g, 0);
+       gg->bandwidth_graph = g;
 }
 
-static void setup_bandwidth_graph(struct gui *ui)
+static void setup_graphs(struct gfio_graphs *g)
 {
-       if (ui->bandwidth_graph)
-               graph_free(ui->bandwidth_graph);
-       ui->bandwidth_graph = graph_new(DRAWING_AREA_XDIM / 2.0,
-                                       DRAWING_AREA_YDIM, gfio_graph_font);
-       graph_title(ui->bandwidth_graph, "Bandwidth");
-       graph_x_title(ui->bandwidth_graph, "Time (secs)");
-       graph_add_label(ui->bandwidth_graph, "Read Bandwidth");
-       graph_add_label(ui->bandwidth_graph, "Write Bandwidth");
-       graph_set_color(ui->bandwidth_graph, "Read Bandwidth", 0.13, 0.54, 0.13);
-       graph_set_color(ui->bandwidth_graph, "Write Bandwidth", 1.0, 0.0, 0.0);
-       add_invisible_data(ui->bandwidth_graph);
+       setup_iops_graph(g);
+       setup_bandwidth_graph(g);
 }
 
-static void clear_ui_info(struct gui *ui)
+void clear_ge_ui_info(struct gui_entry *ge)
 {
-       gtk_label_set_text(GTK_LABEL(ui->probe.hostname), "");
-       gtk_label_set_text(GTK_LABEL(ui->probe.os), "");
-       gtk_label_set_text(GTK_LABEL(ui->probe.arch), "");
-       gtk_label_set_text(GTK_LABEL(ui->probe.fio_ver), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.name), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.iotype), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.ioengine), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.iodepth), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.jobs), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.files), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.read_bw), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.read_iops), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.write_bw), "");
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.write_iops), "");
+       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), "");
+#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.files), "");
+       gtk_entry_set_text(GTK_ENTRY(ge->eta.read_bw), "");
+       gtk_entry_set_text(GTK_ENTRY(ge->eta.read_iops), "");
+       gtk_entry_set_text(GTK_ENTRY(ge->eta.write_bw), "");
+       gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), "");
 }
 
-static GtkWidget *new_info_entry_in_frame(GtkWidget *box, const char *label)
+static void set_menu_entry_text(struct gui *ui, const char *path,
+                               const char *text)
 {
-       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);
+       GtkWidget *w;
 
-       return entry;
+       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 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)
+static void set_menu_entry_visible(struct gui *ui, const char *path, int show)
 {
-       GtkWidget *button, *box;
-
-       box = gtk_hbox_new(FALSE, 3);
-       gtk_container_add(GTK_CONTAINER(hbox), box);
+       GtkWidget *w;
 
-       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;
+       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 gfio_set_connected(struct gui *ui, int connected)
+static void set_job_menu_visible(struct gui *ui, int visible)
 {
-       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");
-               gtk_widget_set_sensitive(ui->button[CONNECT_BUTTON], 1);
-       } 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);
-               gtk_widget_set_sensitive(ui->button[CONNECT_BUTTON], 1);
-       }
+       set_menu_entry_visible(ui, "/MainMenu/JobMenu", visible);
 }
 
-static void label_set_int_value(GtkWidget *entry, unsigned int val)
+static void set_view_results_visible(struct gui *ui, int visible)
 {
-       char tmp[80];
-
-       sprintf(tmp, "%u", val);
-       gtk_label_set_text(GTK_LABEL(entry), tmp);
+       set_menu_entry_visible(ui, "/MainMenu/ViewMenu/Results", visible);
 }
 
-static void entry_set_int_value(GtkWidget *entry, unsigned int val)
+static const char *get_button_tooltip(struct button_spec *s, int sensitive)
 {
-       char tmp[80];
+       if (s->tooltiptext[sensitive])
+               return s->tooltiptext[sensitive];
 
-       sprintf(tmp, "%u", val);
-       gtk_entry_set_text(GTK_ENTRY(entry), tmp);
+       return s->tooltiptext[0];
 }
 
-#define ALIGN_LEFT 1
-#define ALIGN_RIGHT 2
-#define INVISIBLE 4
-#define UNSORTABLE 8
-
-GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title, unsigned int flags)
+static GtkWidget *add_button(GtkWidget *buttonbox,
+                            struct button_spec *buttonspec, gpointer data)
 {
-       GtkCellRenderer *renderer;
-       GtkTreeViewColumn *col;
-       double xalign = 0.0; /* left as default */
-       PangoAlignment align;
-       gboolean visible;
+       GtkWidget *button = gtk_button_new_with_label(buttonspec->buttontext);
+       gboolean sens = buttonspec->start_sensitive;
 
-       align = (flags & ALIGN_LEFT) ? PANGO_ALIGN_LEFT :
-               (flags & ALIGN_RIGHT) ? PANGO_ALIGN_RIGHT :
-               PANGO_ALIGN_CENTER;
-       visible = !(flags & INVISIBLE);
+       g_signal_connect(button, "clicked", G_CALLBACK(buttonspec->f), data);
+       gtk_box_pack_start(GTK_BOX(buttonbox), button, FALSE, FALSE, 3);
 
-       renderer = gtk_cell_renderer_text_new();
-       col = gtk_tree_view_column_new();
+       sens = buttonspec->start_sensitive;
+       gtk_widget_set_tooltip_text(button, get_button_tooltip(buttonspec, sens));
+       gtk_widget_set_sensitive(button, sens);
 
-       gtk_tree_view_column_set_title(col, title);
-       if (!(flags & UNSORTABLE))
-               gtk_tree_view_column_set_sort_column_id(col, index);
-       gtk_tree_view_column_set_resizable(col, TRUE);
-       gtk_tree_view_column_pack_start(col, renderer, TRUE);
-       gtk_tree_view_column_add_attribute(col, renderer, "text", index);
-       gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL);
-       switch (align) {
-       case PANGO_ALIGN_LEFT:
-               xalign = 0.0;
-               break;
-       case PANGO_ALIGN_CENTER:
-               xalign = 0.5;
-               break;
-       case PANGO_ALIGN_RIGHT:
-               xalign = 1.0;
-               break;
-       }
-       gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), xalign, 0.5);
-       gtk_tree_view_column_set_visible(col, visible);
-       gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col);
-       return col;
-}
-
-static void gfio_ui_setup_log(struct gui *ui)
-{
-       GtkTreeSelection *selection;
-       GtkListStore *model;
-       GtkWidget *tree_view;
-
-       model = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
-
-       tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
-       gtk_widget_set_can_focus(tree_view, FALSE);
-
-       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
-       gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-       g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
-               "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
-
-       tree_view_column(tree_view, 0, "Time", ALIGN_RIGHT | UNSORTABLE);
-       tree_view_column(tree_view, 1, "Host", ALIGN_RIGHT | UNSORTABLE);
-       tree_view_column(tree_view, 2, "Level", ALIGN_RIGHT | UNSORTABLE);
-       tree_view_column(tree_view, 3, "Text", ALIGN_LEFT | UNSORTABLE);
-
-       ui->log_model = model;
-       ui->log_tree = tree_view;
+       return button;
 }
 
-static GtkWidget *gfio_output_clat_percentiles(unsigned int *ovals,
-                                              fio_fp64_t *plist,
-                                              unsigned int len,
-                                              const char *base,
-                                              unsigned int scale)
+static void add_buttons(struct gui_entry *ge, struct button_spec *buttonlist,
+                       int nbuttons)
 {
-       GType types[FIO_IO_U_LIST_MAX_LEN];
-       GtkWidget *tree_view;
-       GtkTreeSelection *selection;
-       GtkListStore *model;
-       GtkTreeIter iter;
        int i;
 
-       for (i = 0; i < len; i++)
-               types[i] = G_TYPE_INT;
-
-       model = gtk_list_store_newv(len, types);
-
-       tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
-       gtk_widget_set_can_focus(tree_view, FALSE);
-
-       g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
-               "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
-
-       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
-       gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-
-       for (i = 0; i < len; i++) {
-               char fbuf[8];
-
-               sprintf(fbuf, "%2.2f%%", plist[i].u.f);
-               tree_view_column(tree_view, i, fbuf, ALIGN_RIGHT | UNSORTABLE);
-       }
-
-       gtk_list_store_append(model, &iter);
-
-       for (i = 0; i < len; i++) {
-               if (scale)
-                       ovals[i] = (ovals[i] + 999) / 1000;
-               gtk_list_store_set(model, &iter, i, ovals[i], -1);
-       }
-
-       return tree_view;
+       for (i = 0; i < nbuttons; i++)
+               ge->button[i] = add_button(ge->buttonbox, &buttonlist[i], ge);
 }
 
-static void gfio_show_clat_percentiles(GtkWidget *vbox, struct thread_stat *ts,
-                                      int ddir)
+/*
+ * Update sensitivity of job buttons and job menu items, based on the
+ * state of the client.
+ */
+static void update_button_states(struct gui *ui, struct gui_entry *ge)
 {
-       unsigned int *io_u_plat = ts->io_u_plat[ddir];
-       unsigned long nr = ts->clat_stat[ddir].samples;
-       fio_fp64_t *plist = ts->percentile_list;
-       unsigned int *ovals, len, minv, maxv, scale_down;
-       const char *base;
-       GtkWidget *tree_view, *frame, *hbox;
-       char tmp[64];
-
-       len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
-       if (!len)
-               goto out;
-
-       /*
-        * We default to usecs, but if the value range is such that we
-        * should scale down to msecs, do that.
-        */
-       if (minv > 2000 && maxv > 99999) {
-               scale_down = 1;
-               base = "msec";
-       } else {
-               scale_down = 0;
-               base = "usec";
+       unsigned int connect_state, send_state, start_state, edit_state;
+       const char *connect_str = NULL;
+
+       switch (ge->state) {
+       default:
+               gfio_report_error(ge, "Bad client state: %u\n", ge->state);
+               /* fall through to new state */
+       case GE_STATE_NEW:
+               connect_state = 1;
+               edit_state = 1;
+               connect_str = "Connect";
+               send_state = 0;
+               start_state = 0;
+               break;
+       case GE_STATE_CONNECTED:
+               connect_state = 1;
+               edit_state = 1;
+               connect_str = "Disconnect";
+               send_state = 1;
+               start_state = 0;
+               break;
+       case GE_STATE_JOB_SENT:
+               connect_state = 1;
+               edit_state = 1;
+               connect_str = "Disconnect";
+               send_state = 0;
+               start_state = 1;
+               break;
+       case GE_STATE_JOB_STARTED:
+               connect_state = 1;
+               edit_state = 1;
+               connect_str = "Disconnect";
+               send_state = 0;
+               start_state = 1;
+               break;
+       case GE_STATE_JOB_RUNNING:
+               connect_state = 1;
+               edit_state = 0;
+               connect_str = "Disconnect";
+               send_state = 0;
+               start_state = 0;
+               break;
+       case GE_STATE_JOB_DONE:
+               connect_state = 1;
+               edit_state = 0;
+               connect_str = "Connect";
+               send_state = 0;
+               start_state = 0;
+               break;
        }
 
-       tree_view = gfio_output_clat_percentiles(ovals, plist, len, base, scale_down);
-
-       sprintf(tmp, "Completion percentiles (%s)", base);
-       frame = gtk_frame_new(tmp);
-       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
-       hbox = gtk_hbox_new(FALSE, 3);
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
-
-       gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
-out:
-       if (ovals)
-               free(ovals);
-}
-
-static void gfio_show_lat(GtkWidget *vbox, const char *name, unsigned long min,
-                         unsigned long max, double mean, double dev)
-{
-       const char *base = "(usec)";
-       GtkWidget *hbox, *label, *frame;
-       char *minp, *maxp;
-       char tmp[64];
-
-       if (!usec_to_msec(&min, &max, &mean, &dev))
-               base = "(msec)";
-
-       minp = num2str(min, 6, 1, 0);
-       maxp = num2str(max, 6, 1, 0);
-
-       sprintf(tmp, "%s %s", name, base);
-       frame = gtk_frame_new(tmp);
-       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
-       hbox = gtk_hbox_new(FALSE, 3);
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       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));
 
-       label = new_info_label_in_frame(hbox, "Minimum");
-       gtk_label_set_text(GTK_LABEL(label), minp);
-       label = new_info_label_in_frame(hbox, "Maximum");
-       gtk_label_set_text(GTK_LABEL(label), maxp);
-       label = new_info_label_in_frame(hbox, "Average");
-       sprintf(tmp, "%5.02f", mean);
-       gtk_label_set_text(GTK_LABEL(label), tmp);
-       label = new_info_label_in_frame(hbox, "Standard deviation");
-       sprintf(tmp, "%5.02f", dev);
-       gtk_label_set_text(GTK_LABEL(label), tmp);
+       set_menu_entry_visible(ui, "/MainMenu/JobMenu/Connect", connect_state);
+       set_menu_entry_text(ui, "/MainMenu/JobMenu/Connect", connect_str);
 
-       free(minp);
-       free(maxp);
+       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);
 
+       if (ge->client && ge->client->nr_results)
+               set_view_results_visible(ui, 1);
+       else
+               set_view_results_visible(ui, 0);
 }
 
-#define GFIO_CLAT      1
-#define GFIO_SLAT      2
-#define GFIO_LAT       4
-
-static void gfio_show_ddir_status(GtkWidget *mbox, struct group_run_stats *rs,
-                                 struct thread_stat *ts, int ddir)
+void gfio_set_state(struct gui_entry *ge, unsigned int state)
 {
-       const char *ddir_label[2] = { "Read", "Write" };
-       GtkWidget *frame, *label, *box, *vbox, *main_vbox;
-       unsigned long min[3], max[3], runt;
-       unsigned long long bw, iops;
-       unsigned int flags = 0;
-       double mean[3], dev[3];
-       char *io_p, *bw_p, *iops_p;
-       int i2p;
-
-       if (!ts->runtime[ddir])
-               return;
-
-       i2p = is_power_of_2(rs->kb_base);
-       runt = ts->runtime[ddir];
-
-       bw = (1000 * ts->io_bytes[ddir]) / runt;
-       io_p = num2str(ts->io_bytes[ddir], 6, 1, i2p);
-       bw_p = num2str(bw, 6, 1, i2p);
-
-       iops = (1000 * (uint64_t)ts->total_io_u[ddir]) / runt;
-       iops_p = num2str(iops, 6, 1, 0);
-
-       box = gtk_hbox_new(FALSE, 3);
-       gtk_box_pack_start(GTK_BOX(mbox), box, TRUE, FALSE, 3);
-
-       frame = gtk_frame_new(ddir_label[ddir]);
-       gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
-
-       main_vbox = gtk_vbox_new(FALSE, 3);
-       gtk_container_add(GTK_CONTAINER(frame), main_vbox);
-
-       box = gtk_hbox_new(FALSE, 3);
-       gtk_box_pack_start(GTK_BOX(main_vbox), box, TRUE, FALSE, 3);
-
-       label = new_info_label_in_frame(box, "IO");
-       gtk_label_set_text(GTK_LABEL(label), io_p);
-       label = new_info_label_in_frame(box, "Bandwidth");
-       gtk_label_set_text(GTK_LABEL(label), bw_p);
-       label = new_info_label_in_frame(box, "IOPS");
-       gtk_label_set_text(GTK_LABEL(label), iops_p);
-       label = new_info_label_in_frame(box, "Runtime (msec)");
-       label_set_int_value(label, ts->runtime[ddir]);
-
-       if (calc_lat(&ts->bw_stat[ddir], &min[0], &max[0], &mean[0], &dev[0])) {
-               double p_of_agg = 100.0;
-               const char *bw_str = "KB";
-               char tmp[32];
-
-               if (rs->agg[ddir]) {
-                       p_of_agg = mean[0] * 100 / (double) rs->agg[ddir];
-                       if (p_of_agg > 100.0)
-                               p_of_agg = 100.0;
-               }
-
-               if (mean[0] > 999999.9) {
-                       min[0] /= 1000.0;
-                       max[0] /= 1000.0;
-                       mean[0] /= 1000.0;
-                       dev[0] /= 1000.0;
-                       bw_str = "MB";
-               }
-
-               sprintf(tmp, "Bandwidth (%s)", bw_str);
-               frame = gtk_frame_new(tmp);
-               gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, FALSE, 5);
-
-               box = gtk_hbox_new(FALSE, 3);
-               gtk_container_add(GTK_CONTAINER(frame), box);
-
-               label = new_info_label_in_frame(box, "Minimum");
-               label_set_int_value(label, min[0]);
-               label = new_info_label_in_frame(box, "Maximum");
-               label_set_int_value(label, max[0]);
-               label = new_info_label_in_frame(box, "Percentage of jobs");
-               sprintf(tmp, "%3.2f%%", p_of_agg);
-               gtk_label_set_text(GTK_LABEL(label), tmp);
-               label = new_info_label_in_frame(box, "Average");
-               sprintf(tmp, "%5.02f", mean[0]);
-               gtk_label_set_text(GTK_LABEL(label), tmp);
-               label = new_info_label_in_frame(box, "Standard deviation");
-               sprintf(tmp, "%5.02f", dev[0]);
-               gtk_label_set_text(GTK_LABEL(label), tmp);
-       }
-
-       if (calc_lat(&ts->slat_stat[ddir], &min[0], &max[0], &mean[0], &dev[0]))
-               flags |= GFIO_SLAT;
-       if (calc_lat(&ts->clat_stat[ddir], &min[1], &max[1], &mean[1], &dev[1]))
-               flags |= GFIO_CLAT;
-       if (calc_lat(&ts->lat_stat[ddir], &min[2], &max[2], &mean[2], &dev[2]))
-               flags |= GFIO_LAT;
-
-       if (flags) {
-               frame = gtk_frame_new("Latency");
-               gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, FALSE, 5);
-
-               vbox = gtk_vbox_new(FALSE, 3);
-               gtk_container_add(GTK_CONTAINER(frame), vbox);
-
-               if (flags & GFIO_SLAT)
-                       gfio_show_lat(vbox, "Submission latency", min[0], max[0], mean[0], dev[0]);
-               if (flags & GFIO_CLAT)
-                       gfio_show_lat(vbox, "Completion latency", min[1], max[1], mean[1], dev[1]);
-               if (flags & GFIO_LAT)
-                       gfio_show_lat(vbox, "Total latency", min[2], max[2], mean[2], dev[2]);
-       }
-
-       if (ts->clat_percentiles)
-               gfio_show_clat_percentiles(main_vbox, ts, ddir);
-
-
-       free(io_p);
-       free(bw_p);
-       free(iops_p);
+       ge->state = state;
+       update_button_states(ge->ui, ge);
 }
 
-static GtkWidget *gfio_output_lat_buckets(double *lat, unsigned int num,
-                                         const char **labels)
+static void gfio_ui_setup_log(struct gui *ui)
 {
-       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;
-
-       types = malloc(num * sizeof(GType));
-
-       for (i = 0; i < num; i++)
-               types[i] = G_TYPE_STRING;
+       GtkWidget *tree_view;
 
-       model = gtk_list_store_newv(num, types);
-       free(types);
-       types = NULL;
+       model = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
 
        tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
        gtk_widget_set_can_focus(tree_view, FALSE);
 
-       g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
-               "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
-
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
        gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-
-       for (i = 0; i < num; i++)
-               tree_view_column(tree_view, i, labels[i], ALIGN_RIGHT | UNSORTABLE);
-
-       gtk_list_store_append(model, &iter);
-
-       for (i = 0; i < num; i++) {
-               char fbuf[32];
-
-               if (lat[i] <= 0.0)
-                       sprintf(fbuf, "0.00");
-               else
-                       sprintf(fbuf, "%3.2f%%", lat[i]);
-
-               gtk_list_store_set(model, &iter, i, fbuf, -1);
-       }
-
-       return tree_view;
-}
-
-static void gfio_show_latency_buckets(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", };
-
-       stat_calc_lat_u(ts, io_u_lat_u);
-       stat_calc_lat_m(ts, io_u_lat_m);
-
-       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);
-
-               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);
-       }
-
-       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);
-
-               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);
-       }
-}
-
-static void gfio_show_cpu_usage(GtkWidget *vbox, struct thread_stat *ts)
-{
-       GtkWidget *box, *frame, *entry;
-       double usr_cpu, sys_cpu;
-       unsigned long runtime;
-       char tmp[32];
-
-       runtime = ts->total_run_time;
-       if (runtime) {
-               double runt = (double) runtime;
-
-               usr_cpu = (double) ts->usr_time * 100 / runt;
-               sys_cpu = (double) ts->sys_time * 100 / runt;
-       } else {
-               usr_cpu = 0;
-               sys_cpu = 0;
-       }
-
-       frame = gtk_frame_new("OS resources");
-       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
-       box = gtk_hbox_new(FALSE, 3);
-       gtk_container_add(GTK_CONTAINER(frame), box);
-
-       entry = new_info_entry_in_frame(box, "User CPU");
-       sprintf(tmp, "%3.2f%%", usr_cpu);
-       gtk_entry_set_text(GTK_ENTRY(entry), tmp);
-       entry = new_info_entry_in_frame(box, "System CPU");
-       sprintf(tmp, "%3.2f%%", sys_cpu);
-       gtk_entry_set_text(GTK_ENTRY(entry), tmp);
-       entry = new_info_entry_in_frame(box, "Context switches");
-       entry_set_int_value(entry, ts->ctx);
-       entry = new_info_entry_in_frame(box, "Major faults");
-       entry_set_int_value(entry, ts->majf);
-       entry = new_info_entry_in_frame(box, "Minor faults");
-       entry_set_int_value(entry, ts->minf);
-}
-static void gfio_add_sc_depths_tree(GtkListStore *model,
-                                   struct thread_stat *ts, unsigned int len,
-                                   int submit)
-{
-       double io_u_dist[FIO_IO_U_MAP_NR];
-       GtkTreeIter iter;
-       /* Bits 0, and 3-8 */
-       const int add_mask = 0x1f9;
-       int i, j;
-
-       if (submit)
-               stat_calc_dist(ts->io_u_submit, ts->total_submit, io_u_dist);
-       else
-               stat_calc_dist(ts->io_u_complete, ts->total_complete, io_u_dist);
-
-       gtk_list_store_append(model, &iter);
-
-       gtk_list_store_set(model, &iter, 0, submit ? "Submit" : "Complete", -1);
-
-       for (i = 1, j = 0; i < len; i++) {
-               char fbuf[32];
-
-               if (!(add_mask & (1UL << (i - 1))))
-                       sprintf(fbuf, "0.0%%");
-               else {
-                       sprintf(fbuf, "%3.1f%%", io_u_dist[j]);
-                       j++;
-               }
-
-               gtk_list_store_set(model, &iter, i, fbuf, -1);
-       }
-
-}
-
-static void gfio_add_total_depths_tree(GtkListStore *model,
-                                      struct thread_stat *ts, unsigned int len)
-{
-       double io_u_dist[FIO_IO_U_MAP_NR];
-       GtkTreeIter iter;
-       /* Bits 1-6, and 8 */
-       const int add_mask = 0x17e;
-       int i, j;
-
-       stat_calc_dist(ts->io_u_map, ts_total_io_u(ts), io_u_dist);
-
-       gtk_list_store_append(model, &iter);
-
-       gtk_list_store_set(model, &iter, 0, "Total", -1);
-
-       for (i = 1, j = 0; i < len; i++) {
-               char fbuf[32];
-
-               if (!(add_mask & (1UL << (i - 1))))
-                       sprintf(fbuf, "0.0%%");
-               else {
-                       sprintf(fbuf, "%3.1f%%", io_u_dist[j]);
-                       j++;
-               }
-
-               gtk_list_store_set(model, &iter, i, fbuf, -1);
-       }
-
-}
-
-static void gfio_show_io_depths(GtkWidget *vbox, struct thread_stat *ts)
-{
-       GtkWidget *frame, *box, *tree_view;
-       GtkTreeSelection *selection;
-       GtkListStore *model;
-       GType types[FIO_IO_U_MAP_NR + 1];
-       int i;
-#define NR_LABELS      10
-       const char *labels[NR_LABELS] = { "Depth", "0", "1", "2", "4", "8", "16", "32", "64", ">= 64" };
-
-       frame = gtk_frame_new("IO depths");
-       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
-
-       box = gtk_hbox_new(FALSE, 3);
-       gtk_container_add(GTK_CONTAINER(frame), box);
-
-       for (i = 0; i < NR_LABELS; i++)
-               types[i] = G_TYPE_STRING;
-
-       model = gtk_list_store_newv(NR_LABELS, types);
-
-       tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
-       gtk_widget_set_can_focus(tree_view, FALSE);
-
        g_object_set(G_OBJECT(tree_view), "headers-visible", TRUE,
                "enable-grid-lines", GTK_TREE_VIEW_GRID_LINES_BOTH, NULL);
 
-       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
-       gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_BROWSE);
-
-       for (i = 0; i < NR_LABELS; i++)
-               tree_view_column(tree_view, i, labels[i], ALIGN_RIGHT | UNSORTABLE);
-
-       gfio_add_total_depths_tree(model, ts, NR_LABELS);
-       gfio_add_sc_depths_tree(model, ts, NR_LABELS, 1);
-       gfio_add_sc_depths_tree(model, ts, NR_LABELS, 0);
+       tree_view_column(tree_view, 0, "Time", ALIGN_RIGHT | UNSORTABLE);
+       tree_view_column(tree_view, 1, "Host", ALIGN_RIGHT | UNSORTABLE);
+       tree_view_column(tree_view, 2, "Level", ALIGN_RIGHT | UNSORTABLE);
+       tree_view_column(tree_view, 3, "Text", ALIGN_LEFT | UNSORTABLE);
 
-       gtk_box_pack_start(GTK_BOX(box), tree_view, TRUE, FALSE, 3);
+       ui->log_model = model;
+       ui->log_tree = tree_view;
 }
 
-static gboolean results_window_delete(GtkWidget *w, gpointer data)
+static gint on_config_drawing_area(GtkWidget *w, GdkEventConfigure *event,
+                                  gpointer data)
 {
-       struct gui *ui = (struct gui *) data;
+       struct gfio_graphs *g = data;
 
-       gtk_widget_destroy(w);
-       ui->results_window = NULL;
-       ui->results_notebook = NULL;
+       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 GtkWidget *get_results_window(struct gui *ui)
-{
-       GtkWidget *win, *notebook;
-
-       if (ui->results_window)
-               return ui->results_notebook;
-
-       win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_title(GTK_WINDOW(win), "Results");
-       g_signal_connect(win, "delete-event", G_CALLBACK(results_window_delete), ui);
-       g_signal_connect(win, "destroy", G_CALLBACK(results_window_delete), ui);
-
-       notebook = gtk_notebook_new();
-       gtk_container_add(GTK_CONTAINER(win), notebook);
-
-       ui->results_window = win;
-       ui->results_notebook = notebook;
-       return ui->results_notebook;
-}
-
-static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
-                           struct group_run_stats *rs)
+static void draw_graph(struct graph *g, cairo_t *cr)
 {
-       GtkWidget *res_win, *box, *vbox, *entry;
-       struct gfio_client *gc = client->client_data;
-
-       gdk_threads_enter();
-
-       res_win = get_results_window(gc->ui);
-
-       vbox = gtk_vbox_new(FALSE, 3);
-
-       box = gtk_hbox_new(TRUE, 3);
-       gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5);
-
-       gtk_notebook_append_page(GTK_NOTEBOOK(res_win), vbox, gtk_label_new(ts->name));
-
-       gc->results_widget = vbox;
-
-       entry = new_info_entry_in_frame(box, "Name");
-       gtk_entry_set_text(GTK_ENTRY(entry), ts->name);
-       if (strlen(ts->description)) {
-               entry = new_info_entry_in_frame(box, "Description");
-               gtk_entry_set_text(GTK_ENTRY(entry), ts->description);
-       }
-       entry = new_info_entry_in_frame(box, "Group ID");
-       entry_set_int_value(entry, ts->groupid);
-       entry = new_info_entry_in_frame(box, "Jobs");
-       entry_set_int_value(entry, ts->members);
-       entry = new_info_entry_in_frame(box, "Error");
-       entry_set_int_value(entry, ts->error);
-       entry = new_info_entry_in_frame(box, "PID");
-       entry_set_int_value(entry, ts->pid);
-
-       if (ts->io_bytes[DDIR_READ])
-               gfio_show_ddir_status(vbox, rs, ts, DDIR_READ);
-       if (ts->io_bytes[DDIR_WRITE])
-               gfio_show_ddir_status(vbox, rs, ts, DDIR_WRITE);
-
-       gfio_show_latency_buckets(vbox, ts);
-       gfio_show_cpu_usage(vbox, ts);
-       gfio_show_io_depths(vbox, ts);
-
-       gtk_widget_show_all(gc->ui->results_window);
-       gdk_threads_leave();
-}
-
-static void gfio_text_op(struct fio_client *client, struct fio_net_cmd *cmd)
-{
-       struct cmd_text_pdu *p = (struct cmd_text_pdu *) cmd->payload;
-       struct gfio_client *gc = client->client_data;
-       GtkTreeIter iter;
-       struct tm *tm;
-       time_t sec;
-       char tmp[64], timebuf[80];
-
-       sec = p->log_sec;
-       tm = localtime(&sec);
-       strftime(tmp, sizeof(tmp), "%Y-%m-%d %H:%M:%S", tm);
-       sprintf(timebuf, "%s.%03ld", tmp, p->log_usec / 1000);
-
-       gdk_threads_enter();
-
-       gtk_list_store_append(gc->ui->log_model, &iter);
-       gtk_list_store_set(gc->ui->log_model, &iter, 0, timebuf, -1);
-       gtk_list_store_set(gc->ui->log_model, &iter, 1, client->hostname, -1);
-       gtk_list_store_set(gc->ui->log_model, &iter, 2, p->level, -1);
-       gtk_list_store_set(gc->ui->log_model, &iter, 3, p->buf, -1);
-
-       gdk_threads_leave();
-}
-
-static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd)
-{
-       struct cmd_du_pdu *p = (struct cmd_du_pdu *) cmd->payload;
-       struct gfio_client *gc = client->client_data;
-       GtkWidget *box, *frame, *entry, *vbox;
-
-       gdk_threads_enter();
-
-       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);
-
-       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);
-
-       gtk_widget_show_all(gc->results_widget);
-out:
-       gdk_threads_leave();
+       line_graph_draw(g, cr);
+       cairo_stroke(cr);
 }
 
-extern int sum_stat_clients;
-extern struct thread_stat client_ts;
-extern struct group_run_stats client_gs;
-
-static int sum_stat_nr;
-
-static void gfio_thread_status_op(struct fio_client *client,
-                                 struct fio_net_cmd *cmd)
+static gboolean graph_tooltip(GtkWidget *w, gint x, gint y,
+                             gboolean keyboard_mode, GtkTooltip *tooltip,
+                             gpointer data)
 {
-       struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
-
-       gfio_display_ts(client, &p->ts, &p->rs);
-
-       if (sum_stat_clients == 1)
-               return;
-
-       sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
-       sum_group_stats(&client_gs, &p->rs);
+       struct gfio_graphs *g = data;
+       const char *text = NULL;
 
-       client_ts.members++;
-       client_ts.groupid = p->ts.groupid;
+       if (graph_contains_xy(g->iops_graph, x, y))
+               text = graph_find_tooltip(g->iops_graph, x, y);
+       else if (graph_contains_xy(g->bandwidth_graph, x, y))
+               text = graph_find_tooltip(g->bandwidth_graph, x, y);
 
-       if (++sum_stat_nr == sum_stat_clients) {
-               strcpy(client_ts.name, "All clients");
-               gfio_display_ts(client, &client_ts, &client_gs);
+       if (text) {
+               gtk_tooltip_set_text(tooltip, text);
+               return TRUE;
        }
-}
 
-static void gfio_group_stats_op(struct fio_client *client,
-                               struct fio_net_cmd *cmd)
-{
-       gdk_threads_enter();
-       printf("gfio_group_stats_op called\n");
-       fio_client_ops.group_stats(client, cmd);
-       gdk_threads_leave();
+       return FALSE;
 }
 
 static int on_expose_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p)
 {
-       struct gui *ui = (struct gui *) p;
+       struct gfio_graphs *g = p;
        cairo_t *cr;
 
        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(ui->bandwidth_graph, cr);
-       cairo_stroke(cr);
-       cairo_restore(cr);
+       if (graph_has_tooltips(g->iops_graph) ||
+           graph_has_tooltips(g->bandwidth_graph)) {
+               g_object_set(w, "has-tooltip", TRUE, NULL);
+               g_signal_connect(w, "query-tooltip", G_CALLBACK(graph_tooltip), g);
+       }
 
-       cairo_save(cr);
-       cairo_translate(cr, DRAWING_AREA_XDIM / 2.0, 0);
-                               // DRAWING_AREA_YDIM * 0.05);
-       line_graph_draw(ui->iops_graph, cr);
-       cairo_stroke(cr);
-       cairo_restore(cr);
+       cairo_set_source_rgb(cr, 0, 0, 0);
+       draw_graph(g->iops_graph, cr);
+       draw_graph(g->bandwidth_graph, cr);
        cairo_destroy(cr);
 
        return FALSE;
 }
 
-static void gfio_update_eta(struct jobs_eta *je)
+/*
+ * FIXME: need more handling here
+ */
+static void ge_destroy(struct gui_entry *ge)
 {
-       static int eta_good;
-       char eta_str[128];
-       char output[256];
-       char tmp[32];
-       double perc = 0.0;
-       int i2p = 0;
+       struct gfio_client *gc = ge->client;
 
-       gdk_threads_enter();
+       if (gc) {
+               if (gc->client) {
+                       if (ge->state >= GE_STATE_CONNECTED)
+                               fio_client_terminate(gc->client);
 
-       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_entry_set_text(GTK_ENTRY(ui.eta.jobs), tmp);
-       sprintf(tmp, "%u", je->files_open);
-       gtk_entry_set_text(GTK_ENTRY(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_entry_set_text(GTK_ENTRY(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);
-
-       gtk_entry_set_text(GTK_ENTRY(ui.eta.cr_bw), "---");
-       gtk_entry_set_text(GTK_ENTRY(ui.eta.cr_iops), "---");
-       gtk_entry_set_text(GTK_ENTRY(ui.eta.cw_bw), "---");
-       gtk_entry_set_text(GTK_ENTRY(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);
+                       fio_put_client(gc->client);
                }
-
-               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_entry_set_text(GTK_ENTRY(ui.eta.read_bw), rate_str[0]);
-               gtk_entry_set_text(GTK_ENTRY(ui.eta.read_iops), iops_str[0]);
-               gtk_entry_set_text(GTK_ENTRY(ui.eta.write_bw), rate_str[1]);
-               gtk_entry_set_text(GTK_ENTRY(ui.eta.write_iops), iops_str[1]);
-
-               graph_add_xy_data(ui.iops_graph, "Read IOPS", je->elapsed_sec, je->iops[0]);
-               graph_add_xy_data(ui.iops_graph, "Write IOPS", je->elapsed_sec, je->iops[1]);
-               graph_add_xy_data(ui.bandwidth_graph, "Read Bandwidth", je->elapsed_sec, je->rate[0]);
-               graph_add_xy_data(ui.bandwidth_graph, "Write Bandwidth", je->elapsed_sec, je->rate[1]);
-
-               free(rate_str[0]);
-               free(rate_str[1]);
-               free(iops_str[0]);
-               free(iops_str[1]);
+               free(gc);
        }
 
-       if (eta_str[0]) {
-               char *dst = output + strlen(output);
+       g_hash_table_remove(ge->ui->ge_hash, &ge->page_num);
 
-               sprintf(dst, " - %s", eta_str);
-       }
-               
-       gfio_update_thread_status(output, perc);
-       gdk_threads_leave();
+       free(ge->job_file);
+       free(ge->host);
+       free(ge);
 }
 
-static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd)
+static void ge_widget_destroy(GtkWidget *w, gpointer data)
 {
-       struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
-       struct gfio_client *gc = client->client_data;
-       struct gui *ui = gc->ui;
-       const char *os, *arch;
-       char buf[64];
-
-       os = fio_get_os_string(probe->os);
-       if (!os)
-               os = "unknown";
+       struct gui_entry *ge = (struct gui_entry *) data;
 
-       arch = fio_get_arch_string(probe->arch);
-       if (!arch)
-               os = "unknown";
-
-       if (!client->name)
-               client->name = strdup((char *) probe->hostname);
-
-       gdk_threads_enter();
-
-       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);
-
-       gfio_set_connected(ui, 1);
-
-       gdk_threads_leave();
+       ge_destroy(ge);
 }
 
-static void gfio_update_thread_status(char *status_message, double perc)
+static void gfio_quit(struct gui *ui)
 {
-       static char message[100];
-       const char *m = message;
-
-       strncpy(message, status_message, sizeof(message) - 1);
-       gtk_progress_bar_set_text(
-               GTK_PROGRESS_BAR(ui.thread_status_pb), m);
-       gtk_progress_bar_set_fraction(
-               GTK_PROGRESS_BAR(ui.thread_status_pb), perc / 100.0);
-       gtk_widget_queue_draw(ui.window);
-}
-
-static void gfio_quit_op(struct fio_client *client)
-{
-       struct gfio_client *gc = client->client_data;
-
-       gdk_threads_enter();
-       gfio_set_connected(gc->ui, 0);
-       gdk_threads_leave();
-}
-
-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 gfio_client *gc = client->client_data;
-       struct gui *ui = gc->ui;
-       char tmp[8];
-       int i;
-
-       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);
-
-       gdk_threads_enter();
-
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.name), (gchar *) p->jobname);
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.iotype), ddir_str(p->rw));
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.ioengine), (gchar *) p->ioengine);
-
-       sprintf(tmp, "%u", p->iodepth);
-       gtk_entry_set_text(GTK_ENTRY(ui->eta.iodepth), tmp);
-
-       gdk_threads_leave();
-}
-
-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();
-
-       gfio_set_connected(gc->ui, 0);
-       clear_ui_info(gc->ui);
-
-       sprintf(buf, "Client %s: timeout talking to server.\n", client->hostname);
-
-       dialog = gtk_dialog_new_with_buttons("Timed out!",
-                       GTK_WINDOW(gc->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((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);
-
-       gdk_threads_leave();
+        gtk_main_quit();
 }
 
-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_update_eta,
-       .probe                  = gfio_probe_op,
-       .quit                   = gfio_quit_op,
-       .add_job                = gfio_add_job_op,
-       .timed_out              = gfio_client_timed_out,
-       .stay_connected         = 1,
-};
-
 static void quit_clicked(__attribute__((unused)) GtkWidget *widget,
                 __attribute__((unused)) gpointer data)
 {
-        gtk_main_quit();
+       struct gui *ui = (struct gui *) data;
+
+       gfio_quit(ui);
 }
 
 static void *job_thread(void *arg)
 {
+       struct gui *ui = arg;
+
+       ui->handler_running = 1;
        fio_handle_clients(&gfio_client_ops);
+       ui->handler_running = 0;
        return NULL;
 }
 
-static int send_job_files(struct gui *ui)
+static int send_job_file(struct gui_entry *ge)
 {
-       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++;
-       }
+       struct gfio_client *gc = ge->client;
+       int ret = 0;
 
-       return ret;
-}
+       ret = fio_client_send_ini(gc->client, ge->job_file);
+       if (!ret)
+               return 0;
 
-static void start_job_thread(struct gui *ui)
-{
-       if (send_job_files(ui)) {
-               printf("Yeah, I didn't really like those options too much.\n");
-               gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 1);
-               return;
-       }
+       gfio_report_error(ge, "Failed to send file %s: %s\n", ge->job_file, strerror(-ret));
+       return 1;
 }
 
 static void *server_thread(void *arg)
@@ -1312,86 +459,15 @@ static void gfio_start_server(struct gui *ui)
 static void start_job_clicked(__attribute__((unused)) GtkWidget *widget,
                 gpointer data)
 {
-       struct gui *ui = data;
+       struct gui_entry *ge = data;
+       struct gfio_client *gc = ge->client;
 
-       gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 0);
-       start_job_thread(ui);
+       if (gc)
+               fio_start_client(gc->client);
 }
 
 static void file_open(GtkWidget *w, gpointer data);
 
-static void connect_clicked(GtkWidget *widget, gpointer data)
-{
-       struct gui *ui = data;
-
-       if (!ui->connected) {
-               if (!ui->nr_job_files)
-                       file_open(widget, data);
-               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), "No jobs running");
-               gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), 0.0);
-               if (!fio_clients_connect()) {
-                       pthread_create(&ui->t, NULL, job_thread, NULL);
-                       gtk_widget_set_sensitive(ui->button[CONNECT_BUTTON], 0);
-               }
-       } else {
-               fio_clients_terminate();
-               gfio_set_connected(ui, 0);
-               clear_ui_info(ui);
-       }
-}
-
-static void add_button(struct gui *ui, int i, GtkWidget *buttonbox,
-                       struct button_spec *buttonspec)
-{
-       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], 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,
-                               struct button_spec *buttonlist,
-                               int nbuttons)
-{
-       int i;
-
-       for (i = 0; i < nbuttons; i++)
-               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);
-       }
-}
-
 struct connection_widgets
 {
        GtkWidget *hentry;
@@ -1433,21 +509,25 @@ static void hostname_cb(GtkEntry *entry, gpointer data)
        }
 }
 
-static int get_connection_details(char **host, int *port, int *type,
-                                 int *server_start)
+static int get_connection_details(struct gui_entry *ge)
 {
        GtkWidget *dialog, *box, *vbox, *hbox, *frame, *pentry;
        struct connection_widgets cw;
+       struct gui *ui = ge->ui;
        char *typeentry;
 
+       if (ge->host)
+               return 0;
+
        dialog = gtk_dialog_new_with_buttons("Connection details",
-                       GTK_WINDOW(ui.window),
+                       GTK_WINDOW(ui->window),
                        GTK_DIALOG_DESTROY_WITH_PARENT,
                        GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
                        GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
 
        frame = gtk_frame_new("Hostname / socket name");
-       vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+       /* gtk_dialog_get_content_area() is 2.14 and newer */
+       vbox = GTK_DIALOG(dialog)->vbox;
        gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
 
        box = gtk_vbox_new(FALSE, 6);
@@ -1510,43 +590,304 @@ static int get_connection_details(char **host, int *port, int *type,
                return 1;
        }
 
-       *host = strdup(gtk_entry_get_text(GTK_ENTRY(cw.hentry)));
-       *port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pentry));
-
-       typeentry = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cw.combo));
-       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);
+       ge->host = strdup(gtk_entry_get_text(GTK_ENTRY(cw.hentry)));
+       ge->port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pentry));
+
+       typeentry = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cw.combo));
+       if (!typeentry || !strncmp(typeentry, "IPv4", 4))
+               ge->type = Fio_client_ipv4;
+       else if (!strncmp(typeentry, "IPv6", 4))
+               ge->type = Fio_client_ipv6;
+       else
+               ge->type = Fio_client_socket;
+       g_free(typeentry);
+
+       ge->server_start = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.button));
+
+       gtk_widget_destroy(dialog);
+       return 0;
+}
+
+static void gfio_set_client(struct gfio_client *gc, struct fio_client *client)
+{
+       gc->client = fio_get_client(client);
+       client->client_data = gc;
+}
+
+static void gfio_client_added(struct gui_entry *ge, struct fio_client *client)
+{
+       struct gfio_client *gc;
+
+       gc = malloc(sizeof(*gc));
+       memset(gc, 0, sizeof(*gc));
+       options_default_fill(&gc->o);
+       gc->ge = ge;
+       ge->client = gc;
+       gfio_set_client(gc, client);
+}
+
+static void connect_clicked(GtkWidget *widget, gpointer data)
+{
+       struct gui_entry *ge = data;
+       struct gfio_client *gc = ge->client;
+
+       if (ge->state == GE_STATE_NEW) {
+               int ret;
+
+               if (!ge->job_file)
+                       file_open(widget, ge->ui);
+               if (!ge->job_file)
+                       return;
+
+               gc = ge->client;
+
+               if (!gc->client) {
+                       struct fio_client *client;
+
+                       if (get_connection_details(ge)) {
+                               gfio_report_error(ge, "Failed to get connection details\n");
+                               return;
+                       }
+
+                       client = fio_client_add_explicit(&gfio_client_ops, ge->host, ge->type, ge->port);
+                       if (!client) {
+                               gfio_report_error(ge, "Failed to add client %s\n", ge->host);
+                               free(ge->host);
+                               ge->host = NULL;
+                               return;
+                       }
+                       gfio_set_client(gc, 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);
+               if (!ret) {
+                       if (!ge->ui->handler_running)
+                               pthread_create(&ge->ui->t, NULL, job_thread, ge->ui);
+                       gfio_set_state(ge, GE_STATE_CONNECTED);
+               } else {
+                       gfio_report_error(ge, "Failed to connect to %s: %s\n", ge->client->client->hostname, strerror(-ret));
+               }
+       } else {
+               fio_client_terminate(gc->client);
+               gfio_set_state(ge, GE_STATE_NEW);
+               clear_ge_ui_info(ge);
+       }
+}
+
+static void send_clicked(GtkWidget *widget, gpointer data)
+{
+       struct gui_entry *ge = data;
+
+       if (send_job_file(ge))
+               gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_START], 1);
+}
+
+static GtkWidget *new_client_page(struct gui_entry *ge);
+
+static struct gui_entry *alloc_new_gui_entry(struct gui *ui)
+{
+       struct gui_entry *ge;
+
+       ge = malloc(sizeof(*ge));
+       memset(ge, 0, sizeof(*ge));
+       ge->state = GE_STATE_NEW;
+       ge->ui = ui;
+       return ge;
+}
+
+static struct gui_entry *get_new_ge_with_tab(struct gui *ui, const char *name)
+{
+       struct gui_entry *ge;
+
+       ge = alloc_new_gui_entry(ui);
+
+       ge->vbox = new_client_page(ge);
+       g_signal_connect(ge->vbox, "destroy", G_CALLBACK(ge_widget_destroy), ge);
+
+       ge->page_label = gtk_label_new(name);
+       ge->page_num = gtk_notebook_append_page(GTK_NOTEBOOK(ui->notebook), ge->vbox, ge->page_label);
+
+       g_hash_table_insert(ui->ge_hash, &ge->page_num, ge);
+
+       gtk_widget_show_all(ui->window);
+       return ge;
+}
+
+static void file_new(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+       struct gui_entry *ge;
+
+       ge = get_new_ge_with_tab(ui, "Untitled");
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num);
+}
+
+/*
+ * Return the 'ge' corresponding to the tab. If the active tab is the
+ * main tab, open a new tab.
+ */
+static struct gui_entry *get_ge_from_page(struct gui *ui, gint cur_page,
+                                         int *created)
+{
+       if (!cur_page) {
+               if (created)
+                       *created = 1;
+               return get_new_ge_with_tab(ui, "Untitled");
+       }
+
+       if (created)
+               *created = 0;
+
+       return g_hash_table_lookup(ui->ge_hash, &cur_page);
+}
+
+static struct gui_entry *get_ge_from_cur_tab(struct gui *ui)
+{
+       gint cur_page;
+
+       /*
+        * Main tab is tab 0, so any current page other than 0 holds
+        * a ge entry.
+        */
+       cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook));
+       if (cur_page)
+               return get_ge_from_page(ui, cur_page, NULL);
+
+       return NULL;
+}
+
+static void file_close(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+       struct gui_entry *ge;
+
+       /*
+        * Can't close the main tab
+        */
+       ge = get_ge_from_cur_tab(ui);
+       if (ge) {
+               gtk_widget_destroy(ge->vbox);
+               return;
+       }
+
+       if (g_hash_table_size(ui->ge_hash)) {
+               gfio_report_info(ui, "Error", "The main page view cannot be closed\n");
+               return;
+       }
+
+       gfio_quit(ui);
+}
+
+static void file_add_recent(struct gui *ui, const gchar *uri)
+{
+       GtkRecentData grd;
+
+       memset(&grd, 0, sizeof(grd));
+       grd.display_name = strdup("gfio");
+       grd.description = strdup("Fio job file");
+       grd.mime_type = strdup(GFIO_MIME);
+       grd.app_name = strdup(g_get_application_name());
+       grd.app_exec = strdup("gfio %f/%u");
+
+       gtk_recent_manager_add_full(ui->recentmanager, uri, &grd);
+}
+
+static gchar *get_filename_from_uri(const gchar *uri)
+{
+       if (strncmp(uri, "file://", 7))
+               return strdup(uri);
+
+       return strdup(uri + 7);
+}
+
+static int do_file_open(struct gui_entry *ge, const gchar *uri)
+{
+       struct fio_client *client;
+
+       assert(!ge->job_file);
+
+       ge->job_file = get_filename_from_uri(uri);
+
+       client = fio_client_add_explicit(&gfio_client_ops, ge->host, ge->type, ge->port);
+       if (client) {
+               char *label = strdup(uri);
+
+               basename(label);
+               gtk_label_set_text(GTK_LABEL(ge->page_label), basename(label));
+               free(label);
+
+               gfio_client_added(ge, client);
+               file_add_recent(ge->ui, uri);
+               return 0;
+       }
+
+       gfio_report_error(ge, "Failed to add client %s\n", ge->host);
+       free(ge->host);
+       ge->host = NULL;
+       free(ge->job_file);
+       ge->job_file = NULL;
+       return 1;
+}
+
+static int do_file_open_with_tab(struct gui *ui, const gchar *uri)
+{
+       struct gui_entry *ge;
+       gint cur_page;
+       int ret, ge_is_new = 0;
+
+       /*
+        * Creates new tab if current tab is the main window, or the
+        * current tab already has a client.
+        */
+       cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook));
+       ge = get_ge_from_page(ui, cur_page, &ge_is_new);
+       if (ge->client) {
+               ge = get_new_ge_with_tab(ui, "Untitled");
+               ge_is_new = 1;
+       }
+
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num);
+
+       if (get_connection_details(ge)) {
+               if (ge_is_new)
+                       gtk_widget_destroy(ge->vbox);
+                       
+               return 1;
+       }
+
+       ret = do_file_open(ge, uri);
 
-       *server_start = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.button));
+       if (!ret) {
+               if (ge->server_start)
+                       gfio_start_server(ui);
+       } else {
+               if (ge_is_new)
+                       gtk_widget_destroy(ge->vbox);
+       }
 
-       gtk_widget_destroy(dialog);
-       return 0;
+       return ret;
 }
 
-static void gfio_client_added(struct gui *ui, struct fio_client *client)
+static void recent_open(GtkAction *action, gpointer data)
 {
-       struct gfio_client *gc;
+       struct gui *ui = (struct gui *) data;
+       GtkRecentInfo *info;
+       const gchar *uri;
 
-       gc = malloc(sizeof(*gc));
-       memset(gc, 0, sizeof(*gc));
-       gc->ui = ui;
+       info = g_object_get_data(G_OBJECT(action), "gtk-recent-info");
+       uri = gtk_recent_info_get_uri(info);
 
-       client->client_data = gc;
+       do_file_open_with_tab(ui, uri);
 }
 
 static void file_open(GtkWidget *w, gpointer data)
 {
-       GtkWidget *dialog;
        struct gui *ui = data;
-       GSList *filenames, *fn_glist;
+       GtkWidget *dialog;
        GtkFileFilter *filter;
-       char *host;
-       int port, type, server_start;
+       gchar *filename;
 
        dialog = gtk_file_chooser_dialog_new("Open File",
                GTK_WINDOW(ui->window),
@@ -1554,13 +895,13 @@ static void file_open(GtkWidget *w, gpointer data)
                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                NULL);
-       gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
+       gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
 
        filter = gtk_file_filter_new();
        gtk_file_filter_add_pattern(filter, "*.fio");
        gtk_file_filter_add_pattern(filter, "*.job");
        gtk_file_filter_add_pattern(filter, "*.ini");
-       gtk_file_filter_add_mime_type(filter, "text/fio");
+       gtk_file_filter_add_mime_type(filter, GFIO_MIME);
        gtk_file_filter_set_name(filter, "Fio job file");
        gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
 
@@ -1569,41 +910,12 @@ static void file_open(GtkWidget *w, gpointer data)
                return;
        }
 
-       fn_glist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
+       filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 
        gtk_widget_destroy(dialog);
 
-       if (get_connection_details(&host, &port, &type, &server_start))
-               goto err;
-
-       filenames = fn_glist;
-       while (filenames != NULL) {
-               struct fio_client *client;
-
-               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++;
-
-               client = fio_client_add_explicit(&gfio_client_ops, host, type, port);
-               if (!client) {
-                       GError *error;
-
-                       error = g_error_new(g_quark_from_string("fio"), 1,
-                                       "Failed to add client %s", host);
-                       report_error(error);
-                       g_error_free(error);
-               }
-               gfio_client_added(ui, client);
-                       
-               g_free(filenames->data);
-               filenames = g_slist_next(filenames);
-       }
-       free(host);
-
-       if (server_start)
-               gfio_start_server(ui);
-err:
-       g_slist_free(fn_glist);
+       do_file_open_with_tab(ui, filename);
+       g_free(filename);
 }
 
 static void file_save(GtkWidget *w, gpointer data)
@@ -1641,10 +953,9 @@ static void view_log_destroy(GtkWidget *w, gpointer data)
        ui->log_view = NULL;
 }
 
-static void view_log(GtkWidget *w, gpointer data)
+void gfio_view_log(struct gui *ui)
 {
        GtkWidget *win, *scroll, *vbox, *box;
-       struct gui *ui = (struct gui *) data;
 
        if (ui->log_view)
                return;
@@ -1671,21 +982,141 @@ static void view_log(GtkWidget *w, gpointer data)
        gtk_widget_show_all(win);
 }
 
+static void view_log(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+
+       gfio_view_log(ui);
+}
+
+static void connect_job_entry(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+       struct gui_entry *ge;
+       
+       ge = get_ge_from_cur_tab(ui);
+       if (ge)
+               connect_clicked(w, ge);
+}
+
+static void send_job_entry(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+       struct gui_entry *ge;
+
+       ge = get_ge_from_cur_tab(ui);
+       if (ge)
+               send_clicked(w, ge);
+}
+
+static void edit_job_entry(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+       struct gui_entry *ge;
+
+       ge = get_ge_from_cur_tab(ui);
+       if (ge && ge->client)
+               gopt_get_options_window(ui->window, &ge->client->o);
+}
+
+static void start_job_entry(GtkWidget *w, gpointer data)
+{
+       struct gui *ui = (struct gui *) data;
+       struct gui_entry *ge;
+
+       ge = get_ge_from_cur_tab(ui);
+       if (ge)
+               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);
+       line_graph_set_data_count_limit(g->bandwidth_graph, gfio_graph_limit);
+}
+
+static void ge_update_lim_fn(gpointer key, gpointer value, gpointer data)
+{
+       struct gui_entry *ge = (struct gui_entry *) value;
+
+       __update_graph_limits(&ge->graphs);
+}
+
+static void update_graph_limits(void)
+{
+       struct gui *ui = &main_ui;
+
+       __update_graph_limits(&ui->graphs);
+
+       g_hash_table_foreach(ui->ge_hash, ge_update_lim_fn, NULL);
+}
+
 static void preferences(GtkWidget *w, gpointer data)
 {
        GtkWidget *dialog, *frame, *box, **buttons, *vbox, *font;
+       GtkWidget *hbox, *spin, *entry, *spin_int;
+       struct gui *ui = (struct gui *) data;
        int i;
 
        dialog = gtk_dialog_new_with_buttons("Preferences",
-               GTK_WINDOW(ui.window),
+               GTK_WINDOW(ui->window),
                GTK_DIALOG_DESTROY_WITH_PARENT,
                GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
                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);
 
@@ -1706,14 +1137,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) {
@@ -1730,6 +1153,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);
 }
 
@@ -1771,17 +1198,25 @@ static void about_dialog(GtkWidget *w, gpointer data)
                "wrap-license", TRUE,
                NULL);
 
-       g_free (license_trans);
+       g_free(license_trans);
 }
 
 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", "<Control>N", NULL, G_CALLBACK(file_new) },
+       { "CloseFile", GTK_STOCK_CLOSE, "Close", "<Control>W", NULL, G_CALLBACK(file_close) },
        { "OpenFile", GTK_STOCK_OPEN, NULL,   "<Control>O", NULL, G_CALLBACK(file_open) },
        { "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>D", 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) },
+       { "StartJob", NULL, "Start job", "<Control>L", NULL, G_CALLBACK(start_job_entry) },
        { "Quit", GTK_STOCK_QUIT, NULL,   "<Control>Q", NULL, G_CALLBACK(quit_clicked) },
        { "About", GTK_STOCK_ABOUT, NULL,  NULL, NULL, G_CALLBACK(about_dialog) },
 };
@@ -1791,14 +1226,29 @@ static const gchar *ui_string = " \
        <ui> \
                <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=\"Save\" action=\"SaveFile\" /> \
-                               <separator name=\"Separator\"/> \
-                               <menuitem name=\"Preferences\" action=\"Preferences\" /> \
                                <separator name=\"Separator2\"/> \
+                               <menuitem name=\"Preferences\" action=\"Preferences\" /> \
+                               <separator name=\"Separator3\"/> \
+                               <placeholder name=\"FileRecentFiles\"/> \
+                               <separator name=\"Separator4\"/> \
                                <menuitem name=\"Quit\" action=\"Quit\" /> \
                        </menu> \
+                       <menu name=\"JobMenu\" action=\"JobMenuAction\"> \
+                               <menuitem name=\"Connect\" action=\"ConnectJob\" /> \
+                               <separator name=\"Separator5\"/> \
+                               <menuitem name=\"Edit job\" action=\"EditJob\" /> \
+                               <menuitem name=\"Send job\" action=\"SendJob\" /> \
+                               <separator name=\"Separator6\"/> \
+                               <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\"> \
@@ -1811,7 +1261,7 @@ static const gchar *ui_string = " \
 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");
@@ -1821,84 +1271,164 @@ 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");
 }
 
 void gfio_ui_setup(GtkSettings *settings, GtkWidget *menubar,
-                   GtkWidget *vbox, GtkUIManager *ui_manager)
+                  GtkWidget *vbox, GtkUIManager *ui_manager)
 {
-        gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
 }
 
-static void init_ui(int *argc, char **argv[], struct gui *ui)
+static void combo_entry_changed(GtkComboBox *box, gpointer data)
 {
-       GtkSettings *settings;
-       GtkUIManager *uimanager;
-       GtkWidget *menu, *probe, *probe_frame, *probe_box;
-       GdkColor white;
+       struct gui_entry *ge = (struct gui_entry *) data;
+       gint index;
 
-       memset(ui, 0, sizeof(*ui));
+       index = gtk_combo_box_get_active(box);
 
-       /* Magical g*thread incantation, you just need this thread stuff.
-        * Without it, the update that happens in gfio_update_thread_status
-        * doesn't really happen in a timely fashion, you need expose events
-        */
-       if (!g_thread_supported())
-               g_thread_init(NULL);
-       gdk_threads_init();
+       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);
+}
 
-       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, 700);
+static void combo_entry_destroy(GtkWidget *widget, gpointer data)
+{
+       struct gui_entry *ge = (struct gui_entry *) data;
 
-       g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), NULL);
-       g_signal_connect(ui->window, "destroy", G_CALLBACK(quit_clicked), NULL);
+       multitext_free(&ge->eta.iotype);
+       multitext_free(&ge->eta.bs);
+       multitext_free(&ge->eta.ioengine);
+       multitext_free(&ge->eta.iodepth);
+}
 
-       ui->vbox = gtk_vbox_new(FALSE, 0);
-       gtk_container_add(GTK_CONTAINER (ui->window), ui->vbox);
+static GtkWidget *new_client_page(struct gui_entry *ge)
+{
+       GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
+       GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
 
-       uimanager = gtk_ui_manager_new();
-       menu = get_menubar_menu(ui->window, uimanager, ui);
-       gfio_ui_setup(settings, menu, ui->vbox, uimanager);
+       main_vbox = gtk_vbox_new(FALSE, 3);
 
-       /*
-        * 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, 3);
-       gtk_container_add(GTK_CONTAINER(ui->topalign), ui->topvbox);
-       gtk_box_pack_start(GTK_BOX(ui->vbox), ui->topalign, FALSE, FALSE, 0);
+       top_align = gtk_alignment_new(0, 0, 1, 0);
+       top_vbox = gtk_vbox_new(FALSE, 3);
+       gtk_container_add(GTK_CONTAINER(top_align), top_vbox);
+       gtk_box_pack_start(GTK_BOX(main_vbox), top_align, FALSE, FALSE, 0);
 
        probe = gtk_frame_new("Job");
-       gtk_box_pack_start(GTK_BOX(ui->topvbox), probe, TRUE, FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(main_vbox), probe, FALSE, 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");
+       gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
+       ge->probe.hostname = new_info_label_in_frame(probe_box, "Host");
+       ge->probe.os = new_info_label_in_frame(probe_box, "OS");
+       ge->probe.arch = new_info_label_in_frame(probe_box, "Architecture");
+       ge->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);
+       gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
+
+       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.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");
+       ge->eta.files = new_info_entry_in_frame(probe_box, "Open files");
 
-       ui->eta.name = new_info_entry_in_frame(probe_box, "Name");
-       ui->eta.iotype = new_info_entry_in_frame(probe_box, "IO");
-       ui->eta.ioengine = new_info_entry_in_frame(probe_box, "IO Engine");
-       ui->eta.iodepth = new_info_entry_in_frame(probe_box, "IO Depth");
-       ui->eta.jobs = new_info_entry_in_frame(probe_box, "Jobs");
-       ui->eta.files = new_info_entry_in_frame(probe_box, "Open files");
+       probe_box = gtk_hbox_new(FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
+       ge->eta.read_bw = new_info_entry_in_frame(probe_box, "Read BW");
+       ge->eta.read_iops = new_info_entry_in_frame(probe_box, "IOPS");
+       ge->eta.write_bw = new_info_entry_in_frame(probe_box, "Write BW");
+       ge->eta.write_iops = new_info_entry_in_frame(probe_box, "IOPS");
 
+       /*
+        * Only add this if we have a commit rate
+        */
+#if 0
        probe_box = gtk_hbox_new(FALSE, 3);
        gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, TRUE, FALSE, 3);
+
+       ge->eta.cr_bw = new_info_label_in_frame(probe_box, "Commit BW");
+       ge->eta.cr_iops = new_info_label_in_frame(probe_box, "Commit IOPS");
+
+       ge->eta.cw_bw = new_info_label_in_frame(probe_box, "Commit BW");
+       ge->eta.cw_iops = new_info_label_in_frame(probe_box, "Commit IOPS");
+#endif
+
+       /*
+        * Set up a drawing area and IOPS and bandwidth graphs
+        */
+       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);
+       gtk_widget_modify_bg(ge->graphs.drawing_area, GTK_STATE_NORMAL, &gfio_color_white);
+       g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "expose_event",
+                               G_CALLBACK(on_expose_drawing_area), &ge->graphs);
+       g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "configure_event",
+                               G_CALLBACK(on_config_drawing_area), &ge->graphs);
+       scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
+                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
+                                       ge->graphs.drawing_area);
+       gtk_box_pack_start(GTK_BOX(main_vbox), scrolled_window, TRUE, TRUE, 0);
+
+       setup_graphs(&ge->graphs);
+
+       /*
+        * Set up alignments for widgets at the bottom of ui, 
+        * align bottom left, expand horizontally but not vertically
+        */
+       bottom_align = gtk_alignment_new(0, 1, 1, 0);
+       ge->buttonbox = gtk_hbox_new(FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(bottom_align), ge->buttonbox);
+       gtk_box_pack_start(GTK_BOX(main_vbox), bottom_align, FALSE, FALSE, 0);
+
+       add_buttons(ge, buttonspeclist, ARRAY_SIZE(buttonspeclist));
+
+       /*
+        * Set up thread status progress bar
+        */
+       ge->thread_status_pb = gtk_progress_bar_new();
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ge->thread_status_pb), 0.0);
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ge->thread_status_pb), "No connections");
+       gtk_container_add(GTK_CONTAINER(ge->buttonbox), ge->thread_status_pb);
+
+
+       return main_vbox;
+}
+
+static GtkWidget *new_main_page(struct gui *ui)
+{
+       GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
+       GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
+
+       main_vbox = gtk_vbox_new(FALSE, 3);
+
+       /*
+        * Set up alignments for widgets at the top of ui,
+        * align top left, expand horizontally but not vertically
+        */
+       top_align = gtk_alignment_new(0, 0, 1, 0);
+       top_vbox = gtk_vbox_new(FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(top_align), top_vbox);
+       gtk_box_pack_start(GTK_BOX(main_vbox), top_align, FALSE, FALSE, 0);
+
+       probe = gtk_frame_new("Run statistics");
+       gtk_box_pack_start(GTK_BOX(main_vbox), probe, FALSE, 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, 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");
@@ -1921,35 +1451,32 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
        /*
         * Set up a drawing area and IOPS and bandwidth graphs
         */
-       gdk_color_parse("white", &white);
-       ui->drawing_area = gtk_drawing_area_new();
-       gtk_widget_set_size_request(GTK_WIDGET(ui->drawing_area), 
-                       DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
-       gtk_widget_modify_bg(ui->drawing_area, GTK_STATE_NORMAL, &white);
-       g_signal_connect(G_OBJECT(ui->drawing_area), "expose_event",
-                               G_CALLBACK (on_expose_drawing_area), ui);
-       ui->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui->scrolled_window),
+       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);
+       gtk_widget_modify_bg(ui->graphs.drawing_area, GTK_STATE_NORMAL, &gfio_color_white);
+       g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "expose_event",
+                       G_CALLBACK(on_expose_drawing_area), &ui->graphs);
+       g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "configure_event",
+                       G_CALLBACK(on_config_drawing_area), &ui->graphs);
+       scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(ui->scrolled_window),
-                                       ui->drawing_area);
-       gtk_box_pack_start(GTK_BOX(ui->vbox), ui->scrolled_window,
+       gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
+                                       ui->graphs.drawing_area);
+       gtk_box_pack_start(GTK_BOX(main_vbox), scrolled_window,
                        TRUE, TRUE, 0);
 
-       setup_iops_graph(ui);
-       setup_bandwidth_graph(ui);
+       setup_graphs(&ui->graphs);
 
        /*
         * Set up alignments for widgets at the bottom of ui, 
         * align bottom left, expand horizontally but not vertically
         */
-       ui->bottomalign = gtk_alignment_new(0, 1, 1, 0);
+       bottom_align = gtk_alignment_new(0, 1, 1, 0);
        ui->buttonbox = gtk_hbox_new(FALSE, 0);
-       gtk_container_add(GTK_CONTAINER(ui->bottomalign), ui->buttonbox);
-       gtk_box_pack_start(GTK_BOX(ui->vbox), ui->bottomalign,
-                                       FALSE, FALSE, 0);
-
-       add_buttons(ui, buttonspeclist, ARRAYSIZE(buttonspeclist));
+       gtk_container_add(GTK_CONTAINER(bottom_align), ui->buttonbox);
+       gtk_box_pack_start(GTK_BOX(main_vbox), bottom_align, FALSE, FALSE, 0);
 
        /*
         * Set up thread status progress bar
@@ -1959,6 +1486,184 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), "No connections");
        gtk_container_add(GTK_CONTAINER(ui->buttonbox), ui->thread_status_pb);
 
+       return main_vbox;
+}
+
+static gboolean notebook_switch_page(GtkNotebook *notebook, GtkWidget *widget,
+                                    guint page, gpointer data)
+
+{
+       struct gui *ui = (struct gui *) data;
+       struct gui_entry *ge;
+
+       if (!page) {
+               set_job_menu_visible(ui, 0);
+               set_view_results_visible(ui, 0);
+               return TRUE;
+       }
+
+       set_job_menu_visible(ui, 1);
+       ge = get_ge_from_page(ui, page, NULL);
+       if (ge)
+               update_button_states(ui, ge);
+
+       return TRUE;
+}
+
+static gint compare_recent_items(GtkRecentInfo *a, GtkRecentInfo *b)
+{
+       time_t time_a = gtk_recent_info_get_visited(a);
+       time_t time_b = gtk_recent_info_get_visited(b);
+
+       return time_b - time_a;
+}
+
+static void add_recent_file_items(struct gui *ui)
+{
+       const gchar *gfio = g_get_application_name();
+       GList *items, *item;
+       int i = 0;
+
+       if (ui->recent_ui_id) {
+               gtk_ui_manager_remove_ui(ui->uimanager, ui->recent_ui_id);
+               gtk_ui_manager_ensure_update(ui->uimanager);
+       }
+       ui->recent_ui_id = gtk_ui_manager_new_merge_id(ui->uimanager);
+
+       if (ui->actiongroup) {
+               gtk_ui_manager_remove_action_group(ui->uimanager, ui->actiongroup);
+               g_object_unref(ui->actiongroup);
+       }
+       ui->actiongroup = gtk_action_group_new("RecentFileActions");
+
+       gtk_ui_manager_insert_action_group(ui->uimanager, ui->actiongroup, -1);
+
+       items = gtk_recent_manager_get_items(ui->recentmanager);
+       items = g_list_sort(items, (GCompareFunc) compare_recent_items);
+
+       for (item = items; item && item->data; item = g_list_next(item)) {
+               GtkRecentInfo *info = (GtkRecentInfo *) item->data;
+               gchar *action_name;
+               const gchar *label;
+               GtkAction *action;
+
+               if (!gtk_recent_info_has_application(info, gfio))
+                       continue;
+
+               /*
+                * We only support local files for now
+                */
+               if (!gtk_recent_info_is_local(info) || !gtk_recent_info_exists(info))
+                       continue;
+
+               action_name = g_strdup_printf("RecentFile%u", i++);
+               label = gtk_recent_info_get_display_name(info);
+
+               action = g_object_new(GTK_TYPE_ACTION,
+                                       "name", action_name,
+                                       "label", label, NULL);
+
+               g_object_set_data_full(G_OBJECT(action), "gtk-recent-info",
+                                       gtk_recent_info_ref(info),
+                                       (GDestroyNotify) gtk_recent_info_unref);
+
+
+               g_signal_connect(action, "activate", G_CALLBACK(recent_open), ui);
+
+               gtk_action_group_add_action(ui->actiongroup, action);
+               g_object_unref(action);
+
+               gtk_ui_manager_add_ui(ui->uimanager, ui->recent_ui_id,
+                                       "/MainMenu/FileMenu/FileRecentFiles",
+                                       label, action_name,
+                                       GTK_UI_MANAGER_MENUITEM, FALSE);
+
+               g_free(action_name);
+
+               if (i == 8)
+                       break;
+       }
+
+       g_list_foreach(items, (GFunc) gtk_recent_info_unref, NULL);
+       g_list_free(items);
+}
+
+static void drag_and_drop_received(GtkWidget *widget, GdkDragContext *ctx,
+                                  gint x, gint y, GtkSelectionData *seldata,
+                                  guint info, guint time, gpointer *data)
+{
+       struct gui *ui = (struct gui *) data;
+       gchar **uris;
+       GtkWidget *source;
+
+       source = gtk_drag_get_source_widget(ctx);
+       if (source && widget == gtk_widget_get_toplevel(source)) {
+               gtk_drag_finish(ctx, FALSE, FALSE, time);
+               return;
+       }
+
+       uris = gtk_selection_data_get_uris(seldata);
+       if (!uris) {
+               gtk_drag_finish(ctx, FALSE, FALSE, time);
+               return;
+       }
+
+       if (uris[0])
+               do_file_open_with_tab(ui, uris[0]);
+
+       gtk_drag_finish(ctx, TRUE, FALSE, time);
+       g_strfreev(uris);
+}
+
+static void init_ui(int *argc, char **argv[], struct gui *ui)
+{
+       GtkSettings *settings;
+       GtkWidget *vbox;
+
+       /* Magical g*thread incantation, you just need this thread stuff.
+        * Without it, the update that happens in gfio_update_thread_status
+        * doesn't really happen in a timely fashion, you need expose events
+        */
+       if (!g_thread_supported())
+               g_thread_init(NULL);
+       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();
+       gdk_color_parse("white", &gfio_color_white);
+       
+       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), 1024, 768);
+
+       g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), ui);
+       g_signal_connect(ui->window, "destroy", G_CALLBACK(quit_clicked), ui);
+
+       ui->vbox = gtk_vbox_new(FALSE, 0);
+       gtk_container_add(GTK_CONTAINER(ui->window), ui->vbox);
+
+       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->recentmanager = gtk_recent_manager_get_default();
+       add_recent_file_items(ui);
+
+       ui->notebook = gtk_notebook_new();
+       g_signal_connect(ui->notebook, "switch-page", G_CALLBACK(notebook_switch_page), ui);
+       gtk_notebook_set_scrollable(GTK_NOTEBOOK(ui->notebook), 1);
+       gtk_notebook_popup_enable(GTK_NOTEBOOK(ui->notebook));
+       gtk_container_add(GTK_CONTAINER(ui->vbox), ui->notebook);
+
+       vbox = new_main_page(ui);
+       gtk_drag_dest_set(GTK_WIDGET(ui->window), GTK_DEST_DEFAULT_ALL, NULL, 1, GDK_ACTION_COPY);
+       gtk_drag_dest_add_uri_targets(GTK_WIDGET(ui->window));
+       g_signal_connect(ui->window, "drag-data-received", G_CALLBACK(drag_and_drop_received), ui);
+
+       gtk_notebook_append_page(GTK_NOTEBOOK(ui->notebook), vbox, gtk_label_new("Main"));
+
        gfio_ui_setup_log(ui);
 
        gtk_widget_show_all(ui->window);
@@ -1971,10 +1676,15 @@ int main(int argc, char *argv[], char *envp[])
        if (fio_init_options())
                return 1;
 
-       init_ui(&argc, &argv, &ui);
+       memset(&main_ui, 0, sizeof(main_ui));
+       main_ui.ge_hash = g_hash_table_new(g_int_hash, g_int_equal);
+
+       init_ui(&argc, &argv, &main_ui);
 
        gdk_threads_enter();
        gtk_main();
        gdk_threads_leave();
+
+       g_hash_table_destroy(main_ui.ge_hash);
        return 0;
 }