*/
#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 "graph.h"
static int gfio_server_running;
+static const char *gfio_graph_font;
+static unsigned int gfio_graph_limit = 100;
+static GdkColor white;
-static void gfio_update_thread_status(char *status_message, double perc);
-
-#define ARRAYSIZE(x) (sizeof((x)) / (sizeof((x)[0])))
+static void view_log(GtkWidget *w, gpointer data);
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 },
+ {
+ .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,
+ },
};
-struct probe_widget {
- GtkWidget *hostname;
- GtkWidget *os;
- GtkWidget *arch;
- GtkWidget *fio_ver;
-};
+static void gfio_update_thread_status(struct gui_entry *ge, char *status_message, double perc);
+static void gfio_update_thread_status_all(char *status_message, double perc);
+static void report_error(GError *error);
-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;
-};
+static struct graph *setup_iops_graph(void)
+{
+ 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)");
+ graph_add_label(g, "Read IOPS");
+ graph_add_label(g, "Write IOPS");
+ graph_set_color(g, "Read IOPS", 0.13, 0.54, 0.13);
+ graph_set_color(g, "Write IOPS", 1.0, 0.0, 0.0);
+ line_graph_set_data_count_limit(g, gfio_graph_limit);
+ graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0);
+ return g;
+}
-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;
- GtkWidget *textview;
- 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;
+static struct graph *setup_bandwidth_graph(void)
+{
+ 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)");
+ graph_add_label(g, "Read Bandwidth");
+ graph_add_label(g, "Write Bandwidth");
+ graph_set_color(g, "Read Bandwidth", 0.13, 0.54, 0.13);
+ graph_set_color(g, "Write Bandwidth", 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);
+ return g;
+}
- 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;
-};
+static void setup_graphs(struct gfio_graphs *g)
+{
+ g->iops_graph = setup_iops_graph();
+ g->bandwidth_graph = setup_bandwidth_graph();
+}
-static void clear_ui_info(struct gui *ui)
+static 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 show_info_dialog(struct gui *ui, const char *title,
+ const char *message)
{
- GtkWidget *entry, *frame;
+ GtkWidget *dialog, *content, *label;
- 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);
+ dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(ui->window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
- return entry;
+ content = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+ label = gtk_label_new(message);
+ gtk_container_add(GTK_CONTAINER(content), label);
+ gtk_widget_show_all(dialog);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
}
-static GtkWidget *new_info_label_in_frame(GtkWidget *box, const char *label)
+static void set_menu_entry_text(struct gui *ui, const char *path,
+ const char *text)
{
- GtkWidget *label_widget;
- GtkWidget *frame;
+ GtkWidget *w;
- 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;
+ 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 *create_spinbutton(GtkWidget *hbox, double min, double max, double defval)
-{
- GtkWidget *button, *box;
- box = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(hbox), box);
+static void set_menu_entry_visible(struct gui *ui, const char *path, int show)
+{
+ GtkWidget *w;
- button = gtk_spin_button_new_with_range(min, max, 1.0);
- gtk_box_pack_start(GTK_BOX(box), button, TRUE, TRUE, 0);
+ 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);
+}
- gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(button), defval);
+static void set_job_menu_visible(struct gui *ui, int visible)
+{
+ set_menu_entry_visible(ui, "/MainMenu/JobMenu", visible);
+}
- return button;
+static void set_view_results_visible(struct gui *ui, int visible)
+{
+ set_menu_entry_visible(ui, "/MainMenu/ViewMenu/Results", visible);
}
-static void gfio_set_connected(struct gui *ui, int connected)
+static const char *get_button_tooltip(struct button_spec *s, int sensitive)
{
- 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);
- }
+ if (s->tooltiptext[sensitive])
+ return s->tooltiptext[sensitive];
+
+ return s->tooltiptext[0];
}
-static void label_set_int_value(GtkWidget *entry, unsigned int val)
+static GtkWidget *add_button(GtkWidget *buttonbox,
+ struct button_spec *buttonspec, gpointer data)
{
- char tmp[80];
+ GtkWidget *button = gtk_button_new_with_label(buttonspec->buttontext);
+ gboolean sens = buttonspec->start_sensitive;
+
+ g_signal_connect(button, "clicked", G_CALLBACK(buttonspec->f), data);
+ gtk_box_pack_start(GTK_BOX(buttonbox), button, FALSE, FALSE, 3);
- sprintf(tmp, "%u", val);
- gtk_label_set_text(GTK_LABEL(entry), tmp);
+ sens = buttonspec->start_sensitive;
+ gtk_widget_set_tooltip_text(button, get_button_tooltip(buttonspec, sens));
+ gtk_widget_set_sensitive(button, sens);
+
+ return button;
}
-static void entry_set_int_value(GtkWidget *entry, unsigned int val)
+static void add_buttons(struct gui_entry *ge, struct button_spec *buttonlist,
+ int nbuttons)
{
- char tmp[80];
+ int i;
- sprintf(tmp, "%u", val);
- gtk_entry_set_text(GTK_ENTRY(entry), tmp);
+ for (i = 0; i < nbuttons; i++)
+ ge->button[i] = add_button(ge->buttonbox, &buttonlist[i], ge);
}
-#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)
-{
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *col;
- double xalign = 0.0; /* left as default */
- PangoAlignment align;
- gboolean visible;
-
- align = (flags & ALIGN_LEFT) ? PANGO_ALIGN_LEFT :
- (flags & ALIGN_RIGHT) ? PANGO_ALIGN_RIGHT :
- PANGO_ALIGN_CENTER;
- visible = !(flags & INVISIBLE);
-
- renderer = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new();
-
- 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;
+/*
+ * 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 connect_state, send_state, start_state, edit_state;
+ const char *connect_str = NULL;
+
+ switch (ge->state) {
+ default: {
+ char tmp[80];
+
+ sprintf(tmp, "Bad client state: %u\n", ge->state);
+ show_info_dialog(ui, "Error", tmp);
+ /* 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 PANGO_ALIGN_CENTER:
- xalign = 0.5;
+ case GE_STATE_JOB_SENT:
+ connect_state = 1;
+ edit_state = 1;
+ connect_str = "Disconnect";
+ send_state = 0;
+ start_state = 1;
break;
- case PANGO_ALIGN_RIGHT:
- xalign = 1.0;
+ 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;
}
- 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;
+
+ gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_CONNECT], connect_state);
+ gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_SEND], send_state);
+ gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_START], start_state);
+ gtk_button_set_label(GTK_BUTTON(ge->button[GFIO_BUTTON_CONNECT]), connect_str);
+ gtk_widget_set_tooltip_text(ge->button[GFIO_BUTTON_CONNECT], get_button_tooltip(&buttonspeclist[GFIO_BUTTON_CONNECT], connect_state));
+
+ set_menu_entry_visible(ui, "/MainMenu/JobMenu/Connect", connect_state);
+ set_menu_entry_text(ui, "/MainMenu/JobMenu/Connect", connect_str);
+
+ 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);
+}
+
+static void gfio_set_state(struct gui_entry *ge, unsigned int state)
+{
+ ge->state = state;
+ update_button_states(ge->ui, ge);
}
static void gfio_ui_setup_log(struct gui *ui)
ui->log_tree = tree_view;
}
+static struct graph *setup_clat_graph(char *title, unsigned int *ovals,
+ fio_fp64_t *plist,
+ unsigned int len,
+ double xdim, double ydim)
+{
+ struct graph *g;
+ int i;
+
+ g = graph_new(xdim, ydim, gfio_graph_font);
+ graph_title(g, title);
+ graph_x_title(g, "Percentile");
+ graph_y_title(g, "Time");
+
+ for (i = 0; i < len; i++) {
+ char fbuf[8];
+
+ sprintf(fbuf, "%2.2f%%", plist[i].u.f);
+ graph_add_label(g, fbuf);
+ graph_add_data(g, fbuf, (double) ovals[i]);
+ }
+
+ return g;
+}
+
static GtkWidget *gfio_output_clat_percentiles(unsigned int *ovals,
fio_fp64_t *plist,
unsigned int len,
return tree_view;
}
-static void gfio_show_clat_percentiles(GtkWidget *vbox, struct thread_stat *ts,
+static int on_expose_lat_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p)
+{
+ struct graph *g = p;
+ cairo_t *cr;
+
+ cr = gdk_cairo_create(w->window);
+#if 0
+ if (graph_has_tooltips(g)) {
+ g_object_set(w, "has-tooltip", TRUE, NULL);
+ g_signal_connect(w, "query-tooltip", G_CALLBACK(clat_graph_tooltip), g);
+ }
+#endif
+ cairo_set_source_rgb(cr, 0, 0, 0);
+ bar_graph_draw(g, cr);
+ cairo_destroy(cr);
+
+ return FALSE;
+}
+
+static gint on_config_lat_drawing_area(GtkWidget *w, GdkEventConfigure *event,
+ gpointer data)
+{
+ struct graph *g = data;
+
+ graph_set_size(g, w->allocation.width, w->allocation.height);
+ graph_set_size(g, w->allocation.width, w->allocation.height);
+ graph_set_position(g, 0, 0);
+ return TRUE;
+}
+
+static void gfio_show_clat_percentiles(struct gfio_client *gc,
+ GtkWidget *vbox, struct thread_stat *ts,
int ddir)
{
unsigned int *io_u_plat = ts->io_u_plat[ddir];
fio_fp64_t *plist = ts->percentile_list;
unsigned int *ovals, len, minv, maxv, scale_down;
const char *base;
- GtkWidget *tree_view, *frame, *hbox;
+ GtkWidget *tree_view, *frame, *hbox, *drawing_area, *completion_vbox;
+ struct gui_entry *ge = gc->ge;
char tmp[64];
len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
base = "usec";
}
+ sprintf(tmp, "Completion percentiles (%s)", base);
tree_view = gfio_output_clat_percentiles(ovals, plist, len, base, scale_down);
+ ge->clat_graph = setup_clat_graph(tmp, ovals, plist, len, 700.0, 300.0);
- sprintf(tmp, "Completion percentiles (%s)", base);
frame = gtk_frame_new(tmp);
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
+ completion_vbox = gtk_vbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(frame), completion_vbox);
hbox = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), hbox);
+ gtk_container_add(GTK_CONTAINER(completion_vbox), hbox);
+ drawing_area = gtk_drawing_area_new();
+ gtk_widget_set_size_request(GTK_WIDGET(drawing_area), 700, 300);
+ gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &white);
+ gtk_container_add(GTK_CONTAINER(completion_vbox), drawing_area);
+ g_signal_connect(G_OBJECT(drawing_area), "expose_event", G_CALLBACK(on_expose_lat_drawing_area), ge->clat_graph);
+ g_signal_connect(G_OBJECT(drawing_area), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->clat_graph);
gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
out:
#define GFIO_SLAT 2
#define GFIO_LAT 4
-static void gfio_show_ddir_status(GtkWidget *mbox, struct group_run_stats *rs,
+static void gfio_show_ddir_status(struct gfio_client *gc, GtkWidget *mbox,
+ struct group_run_stats *rs,
struct thread_stat *ts, int ddir)
{
const char *ddir_label[2] = { "Read", "Write" };
}
if (ts->clat_percentiles)
- gfio_show_clat_percentiles(main_vbox, ts, ddir);
-
+ gfio_show_clat_percentiles(gc, main_vbox, ts, ddir);
free(io_p);
free(bw_p);
free(iops_p);
}
-static GtkWidget *gfio_output_lat_buckets(double *lat, unsigned int num,
- const char **labels)
+static struct graph *setup_lat_bucket_graph(const char *title, double *lat,
+ const char **labels,
+ unsigned int len,
+ double xdim, double ydim)
+{
+ struct graph *g;
+ int i;
+
+ g = graph_new(xdim, ydim, gfio_graph_font);
+ graph_title(g, title);
+ graph_x_title(g, "Buckets");
+ graph_y_title(g, "Percent");
+
+ for (i = 0; i < len; i++) {
+ graph_add_label(g, labels[i]);
+ graph_add_data(g, labels[i], lat[i]);
+ }
+
+ return g;
+}
+
+static GtkWidget *gfio_output_lat_buckets(double *lat, const char **labels,
+ int num)
{
GtkWidget *tree_view;
GtkTreeSelection *selection;
GtkListStore *model;
GtkTreeIter iter;
GType *types;
- int i, skipped;
-
- /*
- * Check if all are empty, in which case don't bother
- */
- for (i = 0, skipped = 0; i < num; i++)
- if (lat[i] <= 0.0)
- skipped++;
-
- if (skipped == num)
- return NULL;
+ int i;
types = malloc(num * sizeof(GType));
return tree_view;
}
-static void gfio_show_latency_buckets(GtkWidget *vbox, struct thread_stat *ts)
+static void gfio_show_latency_buckets(struct gfio_client *gc, GtkWidget *vbox,
+ struct thread_stat *ts)
{
- GtkWidget *box, *frame, *tree_view;
- double io_u_lat_u[FIO_IO_U_LAT_U_NR];
- double io_u_lat_m[FIO_IO_U_LAT_M_NR];
- const char *uranges[] = { "2", "4", "10", "20", "50", "100",
- "250", "500", "750", "1000", };
- const char *mranges[] = { "2", "4", "10", "20", "50", "100",
- "250", "500", "750", "1000", "2000",
- ">= 2000", };
+ double io_u_lat[FIO_IO_U_LAT_U_NR + FIO_IO_U_LAT_M_NR];
+ const char *ranges[] = { "2u", "4u", "10u", "20u", "50u", "100u",
+ "250u", "500u", "750u", "1m", "2m",
+ "4m", "10m", "20m", "50m", "100m",
+ "250m", "500m", "750m", "1s", "2s", ">= 2s" };
+ int start, end, i;
+ const int total = FIO_IO_U_LAT_U_NR + FIO_IO_U_LAT_M_NR;
+ GtkWidget *frame, *tree_view, *hbox, *completion_vbox, *drawing_area;
+ struct gui_entry *ge = gc->ge;
+
+ stat_calc_lat_u(ts, io_u_lat);
+ stat_calc_lat_m(ts, &io_u_lat[FIO_IO_U_LAT_U_NR]);
+
+ /*
+ * Found out which first bucket has entries, and which last bucket
+ */
+ start = end = -1U;
+ for (i = 0; i < total; i++) {
+ if (io_u_lat[i] == 0.00)
+ continue;
+
+ if (start == -1U)
+ start = i;
+ end = i;
+ }
- stat_calc_lat_u(ts, io_u_lat_u);
- stat_calc_lat_m(ts, io_u_lat_m);
+ /*
+ * No entries...
+ */
+ if (start == -1U)
+ return;
+
+ tree_view = gfio_output_lat_buckets(&io_u_lat[start], &ranges[start], end - start + 1);
+ ge->lat_bucket_graph = setup_lat_bucket_graph("Latency Buckets", &io_u_lat[start], &ranges[start], end - start + 1, 700.0, 300.0);
- 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);
+ frame = gtk_frame_new("Latency buckets");
+ gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
- box = gtk_hbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(frame), box);
- gtk_box_pack_start(GTK_BOX(box), tree_view, TRUE, FALSE, 3);
- }
+ completion_vbox = gtk_vbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(frame), completion_vbox);
+ hbox = gtk_hbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(completion_vbox), hbox);
- 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);
+ drawing_area = gtk_drawing_area_new();
+ gtk_widget_set_size_request(GTK_WIDGET(drawing_area), 700, 300);
+ gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL, &white);
+ gtk_container_add(GTK_CONTAINER(completion_vbox), drawing_area);
+ g_signal_connect(G_OBJECT(drawing_area), "expose_event", G_CALLBACK(on_expose_lat_drawing_area), ge->lat_bucket_graph);
+ g_signal_connect(G_OBJECT(drawing_area), "configure_event", G_CALLBACK(on_config_lat_drawing_area), ge->lat_bucket_graph);
- 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);
- }
+ gtk_box_pack_start(GTK_BOX(hbox), tree_view, TRUE, FALSE, 3);
}
static void gfio_show_cpu_usage(GtkWidget *vbox, struct thread_stat *ts)
static gboolean results_window_delete(GtkWidget *w, gpointer data)
{
- struct gui *ui = (struct gui *) data;
+ struct gui_entry *ge = (struct gui_entry *) data;
gtk_widget_destroy(w);
- ui->results_window = NULL;
- ui->results_notebook = NULL;
+ ge->results_window = NULL;
+ ge->results_notebook = NULL;
return TRUE;
}
-static GtkWidget *get_results_window(struct gui *ui)
+static void results_close(GtkWidget *w, gpointer *data)
{
- GtkWidget *win, *notebook;
+ struct gui_entry *ge = (struct gui_entry *) data;
- 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);
+ gtk_widget_destroy(ge->results_window);
+}
- notebook = gtk_notebook_new();
- gtk_container_add(GTK_CONTAINER(win), notebook);
+static GtkActionEntry results_menu_items[] = {
+ { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
+ { "GraphMenuAction", GTK_STOCK_FILE, "Graph", NULL, NULL, NULL},
+ { "CloseFile", GTK_STOCK_CLOSE, "Close", "<Control>W", NULL, G_CALLBACK(results_close) },
+};
+static gint results_nmenu_items = sizeof(results_menu_items) / sizeof(results_menu_items[0]);
- ui->results_window = win;
- ui->results_notebook = notebook;
- return ui->results_notebook;
-}
+static const gchar *results_ui_string = " \
+ <ui> \
+ <menubar name=\"MainMenu\"> \
+ <menu name=\"FileMenu\" action=\"FileMenuAction\"> \
+ <menuitem name=\"Close\" action=\"CloseFile\" /> \
+ </menu> \
+ <menu name=\"GraphMenu\" action=\"GraphMenuAction\"> \
+ </menu>\
+ </menubar> \
+ </ui> \
+";
-static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
- struct group_run_stats *rs)
+static GtkWidget *get_results_menubar(GtkWidget *window, struct gui_entry *ge)
{
- GtkWidget *res_win, *box, *vbox, *entry;
- struct gfio_client *gc = client->client_data;
+ GtkActionGroup *action_group;
+ GtkWidget *widget;
+ GError *error = 0;
- gdk_threads_enter();
+ ge->results_uimanager = gtk_ui_manager_new();
- res_win = get_results_window(gc->ui);
+ action_group = gtk_action_group_new("ResultsMenu");
+ gtk_action_group_add_actions(action_group, results_menu_items, results_nmenu_items, ge);
- vbox = gtk_vbox_new(FALSE, 3);
+ gtk_ui_manager_insert_action_group(ge->results_uimanager, action_group, 0);
+ gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ge->results_uimanager), results_ui_string, -1, &error);
- box = gtk_hbox_new(TRUE, 3);
- gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5);
+ gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ge->results_uimanager));
- gtk_notebook_append_page(GTK_NOTEBOOK(res_win), vbox, gtk_label_new(ts->name));
+ widget = gtk_ui_manager_get_widget(ge->results_uimanager, "/MainMenu");
+ return widget;
+}
- gc->results_widget = vbox;
+static GtkWidget *get_results_window(struct gui_entry *ge)
+{
+ GtkWidget *win, *notebook, *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 (ge->results_window)
+ return ge->results_notebook;
- 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);
+ win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(win), "Results");
+ gtk_window_set_default_size(GTK_WINDOW(win), 1024, 768);
+ g_signal_connect(win, "delete-event", G_CALLBACK(results_window_delete), ge);
+ g_signal_connect(win, "destroy", G_CALLBACK(results_window_delete), ge);
- gfio_show_latency_buckets(vbox, ts);
- gfio_show_cpu_usage(vbox, ts);
- gfio_show_io_depths(vbox, ts);
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(win), vbox);
- gtk_widget_show_all(gc->ui->results_window);
- gdk_threads_leave();
+ ge->results_menu = get_results_menubar(win, ge);
+ gtk_box_pack_start(GTK_BOX(vbox), ge->results_menu, FALSE, FALSE, 0);
+
+ notebook = gtk_notebook_new();
+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), 1);
+ gtk_notebook_popup_enable(GTK_NOTEBOOK(notebook));
+ gtk_container_add(GTK_CONTAINER(vbox), notebook);
+
+ ge->results_window = win;
+ ge->results_notebook = notebook;
+ return ge->results_notebook;
}
-static void gfio_text_op(struct fio_client *client, struct fio_net_cmd *cmd)
+static void disk_util_destroy(GtkWidget *w, gpointer data)
{
- 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];
+ struct gui_entry *ge = (struct gui_entry *) data;
- 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);
+ ge->disk_util_vbox = NULL;
+ gtk_widget_destroy(w);
+}
- gdk_threads_enter();
+static GtkWidget *get_scrolled_window(gint border_width)
+{
+ GtkWidget *scroll;
- 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);
+ scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_container_set_border_width(GTK_CONTAINER(scroll), border_width);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gdk_threads_leave();
+ return scroll;
}
-static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd)
+static GtkWidget *gfio_disk_util_get_vbox(struct gui_entry *ge)
{
- struct cmd_du_pdu *p = (struct cmd_du_pdu *) cmd->payload;
- struct gfio_client *gc = client->client_data;
- GtkWidget *box, *frame, *entry, *vbox;
+ GtkWidget *vbox, *box, *scroll, *res_notebook;
- gdk_threads_enter();
+ if (ge->disk_util_vbox)
+ return ge->disk_util_vbox;
- if (!gc->results_widget) {
- printf("no results!\n");
- goto out;
- }
+ scroll = get_scrolled_window(5);
+ vbox = gtk_vbox_new(FALSE, 3);
+ box = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5);
- 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);
- }
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox);
+ res_notebook = get_results_window(ge);
+
+ gtk_notebook_append_page(GTK_NOTEBOOK(res_notebook), scroll, gtk_label_new("Disk utilization"));
+ ge->disk_util_vbox = box;
+ g_signal_connect(vbox, "destroy", G_CALLBACK(disk_util_destroy), ge);
+
+ return ge->disk_util_vbox;
+}
+
+static int __gfio_disk_util_show(GtkWidget *res_notebook,
+ struct gfio_client *gc, struct cmd_du_pdu *p)
+{
+ GtkWidget *box, *frame, *entry, *vbox, *util_vbox;
+ struct gui_entry *ge = gc->ge;
+ double util;
+ char tmp[16];
+
+ util_vbox = gfio_disk_util_get_vbox(ge);
vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(gc->disk_util_frame), vbox);
+ gtk_container_add(GTK_CONTAINER(util_vbox), vbox);
frame = gtk_frame_new((char *) p->dus.name);
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 2);
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();
-}
+ util = 0.0;
+ if (p->dus.msec)
+ util = (double) 100 * p->dus.io_ticks / (double) p->dus.msec;
+ if (util > 100.0)
+ util = 100.0;
-extern int sum_stat_clients;
-extern struct thread_stat client_ts;
-extern struct group_run_stats client_gs;
+ sprintf(tmp, "%3.2f%%", util);
+ entry = new_info_entry_in_frame(vbox, "Disk utilization");
+ gtk_entry_set_text(GTK_ENTRY(entry), tmp);
-static int sum_stat_nr;
+ gtk_widget_show_all(ge->results_window);
+ return 0;
+}
-static void gfio_thread_status_op(struct fio_client *client,
- struct fio_net_cmd *cmd)
+static int gfio_disk_util_show(struct gfio_client *gc)
{
- struct cmd_ts_pdu *p = (struct cmd_ts_pdu *) cmd->payload;
-
- gfio_display_ts(client, &p->ts, &p->rs);
+ struct gui_entry *ge = gc->ge;
+ GtkWidget *res_notebook;
+ int i;
- if (sum_stat_clients == 1)
- return;
+ if (!gc->nr_du)
+ return 1;
- sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
- sum_group_stats(&client_gs, &p->rs);
+ res_notebook = get_results_window(ge);
- client_ts.members++;
- client_ts.groupid = p->ts.groupid;
+ for (i = 0; i < gc->nr_du; i++) {
+ struct cmd_du_pdu *p = &gc->du[i];
- if (++sum_stat_nr == sum_stat_clients) {
- strcpy(client_ts.name, "All clients");
- gfio_display_ts(client, &client_ts, &client_gs);
+ __gfio_disk_util_show(res_notebook, gc, p);
}
+
+ gtk_widget_show_all(ge->results_window);
+ return 0;
}
-static void gfio_group_stats_op(struct fio_client *client,
- struct fio_net_cmd *cmd)
+static void gfio_add_end_results(struct gfio_client *gc, struct thread_stat *ts,
+ struct group_run_stats *rs)
{
- gdk_threads_enter();
- printf("gfio_group_stats_op called\n");
- fio_client_ops.group_stats(client, cmd);
- gdk_threads_leave();
+ unsigned int nr = gc->nr_results;
+
+ gc->results = realloc(gc->results, (nr + 1) * sizeof(struct end_results));
+ memcpy(&gc->results[nr].ts, ts, sizeof(*ts));
+ memcpy(&gc->results[nr].gs, rs, sizeof(*rs));
+ gc->nr_results++;
}
-static void gfio_update_eta(struct jobs_eta *je)
+static void __gfio_display_end_results(GtkWidget *win, struct gfio_client *gc,
+ struct thread_stat *ts,
+ struct group_run_stats *rs)
{
- static int eta_good;
- char eta_str[128];
- char output[256];
- char tmp[32];
- double perc = 0.0;
- int i2p = 0;
+ GtkWidget *box, *vbox, *entry, *scroll;
- gdk_threads_enter();
+ scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_container_set_border_width(GTK_CONTAINER(scroll), 5);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- eta_str[0] = '\0';
- output[0] = '\0';
+ vbox = gtk_vbox_new(FALSE, 3);
- 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);
- }
+ box = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), box, TRUE, FALSE, 5);
+
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), vbox);
+
+ gtk_notebook_append_page(GTK_NOTEBOOK(win), scroll, gtk_label_new(ts->name));
+
+ entry = new_info_entry_in_frame(box, "Name");
+ gtk_entry_set_text(GTK_ENTRY(entry), ts->name);
+ 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);
+ gc->err_entry = 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(gc, vbox, rs, ts, DDIR_READ);
+ if (ts->io_bytes[DDIR_WRITE])
+ gfio_show_ddir_status(gc, vbox, rs, ts, DDIR_WRITE);
+
+ gfio_show_latency_buckets(gc, vbox, ts);
+ gfio_show_cpu_usage(vbox, ts);
+ gfio_show_io_depths(vbox, ts);
+}
+
+static void gfio_display_end_results(struct gfio_client *gc)
+{
+ struct gui_entry *ge = gc->ge;
+ GtkWidget *res_notebook;
+ int i;
+
+ res_notebook = get_results_window(ge);
+
+ for (i = 0; i < gc->nr_results; i++) {
+ struct end_results *e = &gc->results[i];
+
+ __gfio_display_end_results(res_notebook, gc, &e->ts, &e->gs);
+ }
+
+ if (gfio_disk_util_show(gc))
+ gtk_widget_show_all(ge->results_window);
+}
+
+static void gfio_display_ts(struct fio_client *client, struct thread_stat *ts,
+ struct group_run_stats *rs)
+{
+ struct gfio_client *gc = client->client_data;
+ struct gui_entry *ge = gc->ge;
+
+ gfio_add_end_results(gc, ts, rs);
+
+ gdk_threads_enter();
+ if (ge->results_window)
+ __gfio_display_end_results(ge->results_notebook, gc, ts, rs);
+ else
+ gfio_display_end_results(gc);
+ 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 gui *ui = &main_ui;
+ 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(ui->log_model, &iter);
+ gtk_list_store_set(ui->log_model, &iter, 0, timebuf, -1);
+ gtk_list_store_set(ui->log_model, &iter, 1, client->hostname, -1);
+ gtk_list_store_set(ui->log_model, &iter, 2, p->level, -1);
+ gtk_list_store_set(ui->log_model, &iter, 3, p->buf, -1);
+
+ if (p->level == FIO_LOG_ERR)
+ view_log(NULL, (gpointer) ui);
+
+ 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;
+ struct gui_entry *ge = gc->ge;
+ unsigned int nr = gc->nr_du;
+
+ gc->du = realloc(gc->du, (nr + 1) * sizeof(struct cmd_du_pdu));
+ memcpy(&gc->du[nr], p, sizeof(*p));
+ gc->nr_du++;
+
+ gdk_threads_enter();
+ if (ge->results_window)
+ __gfio_disk_util_show(ge->results_notebook, gc, p);
+ else
+ gfio_disk_util_show(gc);
+ gdk_threads_leave();
+}
+
+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)
+{
+ 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);
+
+ client_ts.members++;
+ client_ts.thread_number = p->ts.thread_number;
+ client_ts.groupid = p->ts.groupid;
+
+ if (++sum_stat_nr == sum_stat_clients) {
+ strcpy(client_ts.name, "All clients");
+ gfio_display_ts(client, &client_ts, &client_gs);
+ }
+}
+
+static void gfio_group_stats_op(struct fio_client *client,
+ struct fio_net_cmd *cmd)
+{
+ /* We're ignoring group stats for now */
+}
+
+static gint on_config_drawing_area(GtkWidget *w, GdkEventConfigure *event,
+ gpointer data)
+{
+ struct gfio_graphs *g = data;
+
+ graph_set_size(g->iops_graph, w->allocation.width / 2.0, w->allocation.height);
+ graph_set_position(g->iops_graph, w->allocation.width / 2.0, 0.0);
+ graph_set_size(g->bandwidth_graph, w->allocation.width / 2.0, w->allocation.height);
+ graph_set_position(g->bandwidth_graph, 0, 0);
+ return TRUE;
+}
+
+static void draw_graph(struct graph *g, cairo_t *cr)
+{
+ line_graph_draw(g, cr);
+ cairo_stroke(cr);
+}
+
+static gboolean graph_tooltip(GtkWidget *w, gint x, gint y,
+ gboolean keyboard_mode, GtkTooltip *tooltip,
+ gpointer data)
+{
+ struct gfio_graphs *g = data;
+ const char *text = NULL;
+
+ 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 (text) {
+ gtk_tooltip_set_text(tooltip, text);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static int on_expose_drawing_area(GtkWidget *w, GdkEvent *event, gpointer p)
+{
+ struct gfio_graphs *g = p;
+ cairo_t *cr;
+
+ cr = gdk_cairo_create(w->window);
+
+ 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_set_source_rgb(cr, 0, 0, 0);
+ draw_graph(g->iops_graph, cr);
+ draw_graph(g->bandwidth_graph, cr);
+ cairo_destroy(cr);
+
+ return FALSE;
+}
+
+/*
+ * Client specific ETA
+ */
+static void gfio_update_client_eta(struct fio_client *client, struct jobs_eta *je)
+{
+ struct gfio_client *gc = client->client_data;
+ struct gui_entry *ge = gc->ge;
+ static int eta_good;
+ char eta_str[128];
+ char output[256];
+ char tmp[32];
+ double perc = 0.0;
+ int i2p = 0;
+
+ gdk_threads_enter();
+
+ 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);
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.jobs), tmp);
sprintf(tmp, "%u", je->files_open);
- gtk_entry_set_text(GTK_ENTRY(ui.eta.files), tmp);
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.files), tmp);
#if 0
if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
mr = num2str(je->m_rate, 4, 0, i2p);
tr = num2str(je->t_rate, 4, 0, i2p);
- gtk_entry_set_text(GTK_ENTRY(ui.eta);
+ gtk_entry_set_text(GTK_ENTRY(ge->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), "---");
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.cr_bw), "---");
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.cr_iops), "---");
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.cw_bw), "---");
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.cw_iops), "---");
#endif
if (je->eta_sec != INT_MAX && je->nr_running) {
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]);
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.read_bw), rate_str[0]);
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.read_iops), iops_str[0]);
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.write_bw), rate_str[1]);
+ gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), iops_str[1]);
+
+ graph_add_xy_data(ge->graphs.iops_graph, "Read IOPS", je->elapsed_sec, je->iops[0], iops_str[0]);
+ graph_add_xy_data(ge->graphs.iops_graph, "Write IOPS", je->elapsed_sec, je->iops[1], iops_str[1]);
+ graph_add_xy_data(ge->graphs.bandwidth_graph, "Read Bandwidth", je->elapsed_sec, je->rate[0], rate_str[0]);
+ graph_add_xy_data(ge->graphs.bandwidth_graph, "Write Bandwidth", je->elapsed_sec, je->rate[1], rate_str[1]);
free(rate_str[0]);
free(rate_str[1]);
sprintf(dst, " - %s", eta_str);
}
- gfio_update_thread_status(output, perc);
+ gfio_update_thread_status(ge, output, perc);
+ gdk_threads_leave();
+}
+
+/*
+ * Update ETA in main window for all clients
+ */
+static void gfio_update_all_eta(struct jobs_eta *je)
+{
+ struct gui *ui = &main_ui;
+ static int eta_good;
+ char eta_str[128];
+ char output[256];
+ double perc = 0.0;
+ int i2p = 0;
+
+ gdk_threads_enter();
+
+ 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);
+ }
+
+#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
+
+ entry_set_int_value(ui->eta.jobs, je->nr_running);
+
+ if (je->eta_sec != INT_MAX && je->nr_running) {
+ char *iops_str[2];
+ char *rate_str[2];
+
+ if ((!je->eta_sec && !eta_good) || je->nr_ramp == je->nr_running)
+ strcpy(output, "-.-% done");
+ else {
+ eta_good = 1;
+ perc *= 100.0;
+ sprintf(output, "%3.1f%% done", perc);
+ }
+
+ rate_str[0] = num2str(je->rate[0], 5, 10, i2p);
+ rate_str[1] = num2str(je->rate[1], 5, 10, i2p);
+
+ iops_str[0] = num2str(je->iops[0], 4, 1, 0);
+ iops_str[1] = num2str(je->iops[1], 4, 1, 0);
+
+ gtk_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->graphs.iops_graph, "Read IOPS", je->elapsed_sec, je->iops[0], iops_str[0]);
+ graph_add_xy_data(ui->graphs.iops_graph, "Write IOPS", je->elapsed_sec, je->iops[1], iops_str[1]);
+ graph_add_xy_data(ui->graphs.bandwidth_graph, "Read Bandwidth", je->elapsed_sec, je->rate[0], rate_str[0]);
+ graph_add_xy_data(ui->graphs.bandwidth_graph, "Write Bandwidth", je->elapsed_sec, je->rate[1], rate_str[1]);
+
+ free(rate_str[0]);
+ free(rate_str[1]);
+ free(iops_str[0]);
+ free(iops_str[1]);
+ }
+
+ if (eta_str[0]) {
+ char *dst = output + strlen(output);
+
+ sprintf(dst, " - %s", eta_str);
+ }
+
+ gfio_update_thread_status_all(output, perc);
gdk_threads_leave();
}
{
struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
struct gfio_client *gc = client->client_data;
- struct gui *ui = gc->ui;
+ struct gui_entry *ge = gc->ge;
const char *os, *arch;
char buf[64];
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);
+ gtk_label_set_text(GTK_LABEL(ge->probe.hostname), (char *) probe->hostname);
+ gtk_label_set_text(GTK_LABEL(ge->probe.os), os);
+ gtk_label_set_text(GTK_LABEL(ge->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);
+ gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), buf);
- gfio_set_connected(ui, 1);
+ gfio_set_state(ge, GE_STATE_CONNECTED);
gdk_threads_leave();
}
-static void gfio_update_thread_status(char *status_message, double perc)
+static void gfio_update_thread_status(struct gui_entry *ge,
+ char *status_message, double perc)
+{
+ static char message[100];
+ const char *m = message;
+
+ strncpy(message, status_message, sizeof(message) - 1);
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ge->thread_status_pb), m);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ge->thread_status_pb), perc / 100.0);
+ gtk_widget_queue_draw(main_ui.window);
+}
+
+static void gfio_update_thread_status_all(char *status_message, double perc)
{
+ struct gui *ui = &main_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);
+ 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)
+static void gfio_quit_op(struct fio_client *client, struct fio_net_cmd *cmd)
{
struct gfio_client *gc = client->client_data;
gdk_threads_enter();
- gfio_set_connected(gc->ui, 0);
+ gfio_set_state(gc->ge, GE_STATE_NEW);
gdk_threads_leave();
}
{
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;
+ struct thread_options *o = &gc->o;
+ struct gui_entry *ge = gc->ge;
+ char *c1, *c2, *c3, *c4;
+ char tmp[80];
- p->iodepth = le32_to_cpu(p->iodepth);
- p->rw = le32_to_cpu(p->rw);
+ p->thread_number = le32_to_cpu(p->thread_number);
+ p->groupid = le32_to_cpu(p->groupid);
+ convert_thread_options_to_cpu(o, &p->top);
- 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]);
- }
+ gdk_threads_enter();
- p->numjobs = le32_to_cpu(p->numjobs);
- p->group_reporting = le32_to_cpu(p->group_reporting);
+ gtk_label_set_text(GTK_LABEL(ge->page_label), (gchar *) o->name);
- gdk_threads_enter();
+ gtk_combo_box_append_text(GTK_COMBO_BOX(ge->eta.names), (gchar *) o->name);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(ge->eta.names), 0);
+
+ sprintf(tmp, "%s %s", o->odirect ? "direct" : "buffered", ddir_str(o->td_ddir));
+ multitext_add_entry(&ge->eta.iotype, tmp);
- 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);
+ c1 = fio_uint_to_kmg(o->min_bs[DDIR_READ]);
+ c2 = fio_uint_to_kmg(o->max_bs[DDIR_WRITE]);
+ c3 = fio_uint_to_kmg(o->min_bs[DDIR_READ]);
+ c4 = fio_uint_to_kmg(o->max_bs[DDIR_WRITE]);
+ sprintf(tmp, "%s-%s/%s-%s", c1, c2, c3, c4);
+ free(c1);
+ free(c2);
+ free(c3);
+ free(c4);
+ multitext_add_entry(&ge->eta.bs, tmp);
- sprintf(tmp, "%u", p->iodepth);
- gtk_entry_set_text(GTK_ENTRY(ui->eta.iodepth), tmp);
+ multitext_add_entry(&ge->eta.ioengine, (const char *) o->ioengine);
+
+ sprintf(tmp, "%u", o->iodepth);
+ multitext_add_entry(&ge->eta.iodepth, tmp);
+
+ multitext_set_entry(&ge->eta.iotype, 0);
+ multitext_set_entry(&ge->eta.bs, 0);
+ multitext_set_entry(&ge->eta.ioengine, 0);
+ multitext_set_entry(&ge->eta.iodepth, 0);
+
+ gfio_set_state(ge, GE_STATE_JOB_SENT);
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);
+ gfio_set_state(gc->ge, GE_STATE_NEW);
+ clear_ge_ui_info(gc->ge);
sprintf(buf, "Client %s: timeout talking to server.\n", client->hostname);
+ show_info_dialog(gc->ge->ui, "Network timeout", buf);
- 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);
+ gdk_threads_leave();
+}
- 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);
+static void gfio_client_stop(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+ struct gfio_client *gc = client->client_data;
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ gdk_threads_enter();
+
+ gfio_set_state(gc->ge, GE_STATE_JOB_DONE);
+
+ if (gc->err_entry)
+ entry_set_int_value(gc->err_entry, client->error);
+
+ gdk_threads_leave();
+}
+static void gfio_client_start(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+ struct gfio_client *gc = client->client_data;
+
+ gdk_threads_enter();
+ gfio_set_state(gc->ge, GE_STATE_JOB_STARTED);
gdk_threads_leave();
}
+static void gfio_client_job_start(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+ struct gfio_client *gc = client->client_data;
+
+ gdk_threads_enter();
+ gfio_set_state(gc->ge, GE_STATE_JOB_RUNNING);
+ gdk_threads_leave();
+}
+
+static void gfio_client_iolog(struct fio_client *client, struct cmd_iolog_pdu *pdu)
+{
+ printf("got iolog: name=%s, type=%u, entries=%u\n", pdu->name, pdu->log_type, pdu->nr_samples);
+ free(pdu);
+}
+
struct client_ops gfio_client_ops = {
- .text_op = gfio_text_op,
+ .text = 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,
+ .jobs_eta = gfio_update_client_eta,
+ .eta = gfio_update_all_eta,
.probe = gfio_probe_op,
.quit = gfio_quit_op,
.add_job = gfio_add_job_op,
.timed_out = gfio_client_timed_out,
+ .stop = gfio_client_stop,
+ .start = gfio_client_start,
+ .job_start = gfio_client_job_start,
+ .iolog = gfio_client_iolog,
+ .eta_msec = FIO_CLIENT_DEF_ETA_MSEC,
.stay_connected = 1,
+ .client_type = FIO_CLIENT_TYPE_GUI,
};
+/*
+ * FIXME: need more handling here
+ */
+static void ge_destroy(struct gui_entry *ge)
+{
+ struct gfio_client *gc = ge->client;
+
+ if (gc && gc->client) {
+ if (ge->state >= GE_STATE_CONNECTED)
+ fio_client_terminate(gc->client);
+
+ fio_put_client(gc->client);
+ }
+
+ flist_del(&ge->list);
+ free(ge);
+}
+
+static void ge_widget_destroy(GtkWidget *w, gpointer data)
+{
+}
+
+static void gfio_quit(struct gui *ui)
+{
+ struct gui_entry *ge;
+
+ while (!flist_empty(&ui->list)) {
+ ge = flist_entry(ui->list.next, struct gui_entry, list);
+ ge_destroy(ge);
+ }
+
+ gtk_main_quit();
+}
+
static void quit_clicked(__attribute__((unused)) GtkWidget *widget,
__attribute__((unused)) gpointer data)
{
- gtk_main_quit();
+ gfio_quit(data);
}
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_files(struct gui_entry *ge)
{
+ struct gfio_client *gc = ge->client;
int i, ret = 0;
- for (i = 0; i < ui->nr_job_files; i++) {
- ret = fio_clients_send_ini(ui->job_files[i]);
- if (ret)
+ for (i = 0; i < ge->nr_job_files; i++) {
+ ret = fio_client_send_ini(gc->client, ge->job_files[i]);
+ if (ret < 0) {
+ GError *error;
+
+ error = g_error_new(g_quark_from_string("fio"), 1, "Failed to send file %s: %s\n", ge->job_files[i], strerror(-ret));
+ report_error(error);
+ g_error_free(error);
+ break;
+ } else if (ret)
break;
- free(ui->job_files[i]);
- ui->job_files[i] = NULL;
+ free(ge->job_files[i]);
+ ge->job_files[i] = NULL;
}
- while (i < ui->nr_job_files) {
- free(ui->job_files[i]);
- ui->job_files[i] = NULL;
+ while (i < ge->nr_job_files) {
+ free(ge->job_files[i]);
+ ge->job_files[i] = NULL;
i++;
}
+ free(ge->job_files);
+ ge->job_files = NULL;
+ ge->nr_job_files = 0;
return ret;
}
-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;
- }
-}
-
static void *server_thread(void *arg)
{
is_backend = 1;
return NULL;
}
-static void gfio_start_server(struct gui *ui)
+static void gfio_start_server(void)
{
+ struct gui *ui = &main_ui;
+
if (!gfio_server_running) {
gfio_server_running = 1;
pthread_create(&ui->server_t, NULL, server_thread, NULL);
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;
+ struct gui_entry *ge = data;
+ struct gfio_client *gc = ge->client;
+
+ if (ge->state == GE_STATE_NEW) {
+ int ret;
+
+ if (!ge->nr_job_files)
+ file_open(widget, ge->ui);
+ if (!ge->nr_job_files)
+ return;
+
+ gc = ge->client;
+
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ge->thread_status_pb), "No jobs running");
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ge->thread_status_pb), 0.0);
+ ret = fio_client_connect(gc->client);
+ 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 {
+ GError *error;
- 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);
+ error = g_error_new(g_quark_from_string("fio"), 1, "Failed to connect to %s: %s\n", ge->client->client->hostname, strerror(-ret));
+ report_error(error);
+ g_error_free(error);
}
} else {
- fio_clients_terminate();
- gfio_set_connected(ui, 0);
- clear_ui_info(ui);
+ fio_client_terminate(gc->client);
+ gfio_set_state(ge, GE_STATE_NEW);
+ clear_ge_ui_info(ge);
}
}
-static void add_button(struct gui *ui, int i, GtkWidget *buttonbox,
- struct button_spec *buttonspec)
+static void send_clicked(GtkWidget *widget, gpointer data)
{
- 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);
-}
+ struct gui_entry *ge = data;
-static void add_buttons(struct gui *ui,
- struct button_spec *buttonlist,
- int nbuttons)
-{
- int i;
+ if (send_job_files(ge)) {
+ GError *error;
- for (i = 0; i < nbuttons; i++)
- add_button(ui, i, ui->buttonbox, &buttonlist[i]);
+ error = g_error_new(g_quark_from_string("fio"), 1, "Failed to send one or more job files for client %s", ge->client->client->hostname);
+ report_error(error);
+ g_error_free(error);
+
+ gtk_widget_set_sensitive(ge->button[GFIO_BUTTON_START], 1);
+ }
}
static void on_info_bar_response(GtkWidget *widget, gint response,
gpointer data)
{
+ struct gui *ui = &main_ui;
+
if (response == GTK_RESPONSE_OK) {
gtk_widget_destroy(widget);
- ui.error_info_bar = NULL;
+ ui->error_info_bar = NULL;
}
}
-void report_error(GError *error)
+static void report_error(GError *error)
{
- if (ui.error_info_bar == NULL) {
- ui.error_info_bar = gtk_info_bar_new_with_buttons(GTK_STOCK_OK,
+ struct gui *ui = &main_ui;
+
+ 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),
+ 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);
+ 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);
+ 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);
+ gtk_label_set(GTK_LABEL(ui->error_label), buffer);
+ }
+}
+
+struct connection_widgets
+{
+ GtkWidget *hentry;
+ GtkWidget *combo;
+ GtkWidget *button;
+};
+
+static void hostname_cb(GtkEntry *entry, gpointer data)
+{
+ struct connection_widgets *cw = data;
+ int uses_net = 0, is_localhost = 0;
+ const gchar *text;
+ gchar *ctext;
+
+ /*
+ * Check whether to display the 'auto start backend' box
+ * or not. Show it if we are a localhost and using network,
+ * or using a socket.
+ */
+ ctext = gtk_combo_box_get_active_text(GTK_COMBO_BOX(cw->combo));
+ if (!ctext || !strncmp(ctext, "IPv4", 4) || !strncmp(ctext, "IPv6", 4))
+ uses_net = 1;
+ g_free(ctext);
+
+ if (uses_net) {
+ text = gtk_entry_get_text(GTK_ENTRY(cw->hentry));
+ if (!strcmp(text, "127.0.0.1") || !strcmp(text, "localhost") ||
+ !strcmp(text, "::1") || !strcmp(text, "ip6-localhost") ||
+ !strcmp(text, "ip6-loopback"))
+ is_localhost = 1;
+ }
+
+ if (!uses_net || is_localhost) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cw->button), 1);
+ gtk_widget_set_sensitive(cw->button, 1);
+ } else {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cw->button), 0);
+ gtk_widget_set_sensitive(cw->button, 0);
}
}
static int get_connection_details(char **host, int *port, int *type,
int *server_start)
{
- GtkWidget *dialog, *box, *vbox, *hentry, *hbox, *frame, *pentry, *combo;
- GtkWidget *button;
+ GtkWidget *dialog, *box, *vbox, *hbox, *frame, *pentry;
+ struct connection_widgets cw;
char *typeentry;
dialog = gtk_dialog_new_with_buttons("Connection details",
- GTK_WINDOW(ui.window),
+ GTK_WINDOW(main_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);
hbox = gtk_hbox_new(TRUE, 10);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
- hentry = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(hentry), "localhost");
- gtk_box_pack_start(GTK_BOX(hbox), hentry, TRUE, TRUE, 0);
+ cw.hentry = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(cw.hentry), "localhost");
+ gtk_box_pack_start(GTK_BOX(hbox), cw.hentry, TRUE, TRUE, 0);
frame = gtk_frame_new("Port");
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
hbox = gtk_hbox_new(TRUE, 4);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
- combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "IPv4");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "IPv6");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "local socket");
- gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
+ cw.combo = gtk_combo_box_new_text();
+ gtk_combo_box_append_text(GTK_COMBO_BOX(cw.combo), "IPv4");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(cw.combo), "IPv6");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(cw.combo), "local socket");
+ gtk_combo_box_set_active(GTK_COMBO_BOX(cw.combo), 0);
- gtk_container_add(GTK_CONTAINER(hbox), combo);
+ gtk_container_add(GTK_CONTAINER(hbox), cw.combo);
frame = gtk_frame_new("Options");
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 5);
hbox = gtk_hbox_new(TRUE, 4);
gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
- button = gtk_check_button_new_with_label("Auto-spawn fio backend");
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), 1);
- gtk_widget_set_tooltip_text(button, "When running fio locally, it is necessary to have the backend running on the same system. If this is checked, gfio will start the backend automatically for you if it isn't already running.");
- gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 6);
+ cw.button = gtk_check_button_new_with_label("Auto-spawn fio backend");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cw.button), 1);
+ gtk_widget_set_tooltip_text(cw.button, "When running fio locally, it is necessary to have the backend running on the same system. If this is checked, gfio will start the backend automatically for you if it isn't already running.");
+ gtk_box_pack_start(GTK_BOX(hbox), cw.button, FALSE, FALSE, 6);
+
+ /*
+ * Connect edit signal, so we can show/not-show the auto start button
+ */
+ g_signal_connect(GTK_OBJECT(cw.hentry), "changed", G_CALLBACK(hostname_cb), &cw);
+ g_signal_connect(GTK_OBJECT(cw.combo), "changed", G_CALLBACK(hostname_cb), &cw);
gtk_widget_show_all(dialog);
return 1;
}
- *host = strdup(gtk_entry_get_text(GTK_ENTRY(hentry)));
- *port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(pentry));
+ *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);
+
+ *server_start = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cw.button));
+
+ gtk_widget_destroy(dialog);
+ return 0;
+}
+
+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));
+ gc->ge = ge;
+ gc->client = fio_get_client(client);
+
+ ge->client = gc;
+
+ client->client_data = gc;
+}
+
+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;
+ INIT_FLIST_HEAD(&ge->list);
+ flist_add_tail(&ge->list, &ui->list);
+ ge->ui = ui;
+ return ge;
+}
+
+static struct gui_entry *get_new_ge_with_tab(const char *name)
+{
+ struct gui_entry *ge;
+
+ ge = alloc_new_gui_entry(&main_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(main_ui.notebook), ge->vbox, ge->page_label);
+
+ gtk_widget_show_all(main_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("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(gint cur_page, int *created)
+{
+ struct flist_head *entry;
+ struct gui_entry *ge;
+
+ if (!cur_page) {
+ if (created)
+ *created = 1;
+ return get_new_ge_with_tab("Untitled");
+ }
+
+ if (created)
+ *created = 0;
+
+ flist_for_each(entry, &main_ui.list) {
+ ge = flist_entry(entry, struct gui_entry, list);
+ if (ge->page_num == cur_page)
+ return ge;
+ }
+
+ return NULL;
+}
+
+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(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 (!flist_empty(&ui->list)) {
+ show_info_dialog(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, char *host,
+ int type, int port)
+{
+ struct fio_client *client;
+ gchar *filename;
+
+ filename = get_filename_from_uri(uri);
+
+ ge->job_files = realloc(ge->job_files, (ge->nr_job_files + 1) * sizeof(char *));
+ ge->job_files[ge->nr_job_files] = strdup(filename);
+ ge->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);
+ return 1;
+ }
+
+ gfio_client_added(ge, client);
+ file_add_recent(ge->ui, uri);
+ return 0;
+}
+
+static int do_file_open_with_tab(struct gui *ui, const gchar *uri)
+{
+ int port, type, server_start;
+ struct gui_entry *ge;
+ gint cur_page;
+ char *host;
+ 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(cur_page, &ge_is_new);
+ if (ge->client) {
+ ge = get_new_ge_with_tab("Untitled");
+ ge_is_new = 1;
+ }
+
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num);
+
+ if (get_connection_details(&host, &port, &type, &server_start)) {
+ if (ge_is_new)
+ gtk_widget_destroy(ge->vbox);
+
+ return 1;
+ }
+
+ ret = do_file_open(ge, uri, host, type, port);
- typeentry = gtk_combo_box_get_active_text(GTK_COMBO_BOX(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);
+ free(host);
- *server_start = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
+ if (!ret) {
+ if (server_start)
+ gfio_start_server();
+ } 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;
+ GtkWidget *dialog;
GSList *filenames, *fn_glist;
GtkFileFilter *filter;
- char *host;
- int port, type, server_start;
dialog = gtk_file_chooser_dialog_new("Open File",
GTK_WINDOW(ui->window),
filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter, "*.fio");
gtk_file_filter_add_pattern(filter, "*.job");
- gtk_file_filter_add_mime_type(filter, "text/fio");
+ gtk_file_filter_add_pattern(filter, "*.ini");
+ 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);
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);
+ if (do_file_open_with_tab(ui, filenames->data))
+ break;
filenames = g_slist_next(filenames);
}
- free(host);
- if (server_start)
- gfio_start_server(ui);
-err:
g_slist_free(fn_glist);
}
gtk_widget_show_all(win);
}
+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 update_graph_limits(void)
+{
+ struct flist_head *entry;
+ struct gui_entry *ge;
+
+ __update_graph_limits(&main_ui.graphs);
+
+ flist_for_each(entry, &main_ui.list) {
+ ge = flist_entry(entry, struct gui_entry, list);
+ __update_graph_limits(&ge->graphs);
+ }
+}
+
static void preferences(GtkWidget *w, gpointer data)
{
- GtkWidget *dialog, *frame, *box, **buttons;
+ GtkWidget *dialog, *frame, *box, **buttons, *vbox, *font;
+ GtkWidget *hbox, *spin, *entry, *spin_int;
int i;
dialog = gtk_dialog_new_with_buttons("Preferences",
- GTK_WINDOW(ui.window),
+ GTK_WINDOW(main_ui.window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
+ 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);
+
box = gtk_hbox_new(FALSE, 6);
- gtk_container_add(GTK_CONTAINER(frame), box);
+ gtk_container_add(GTK_CONTAINER(vbox), box);
buttons = malloc(sizeof(GtkWidget *) * FD_DEBUG_MAX);
for (i = 0; i < FD_DEBUG_MAX; i++) {
+ if (i == 7) {
+ box = gtk_hbox_new(FALSE, 6);
+ gtk_container_add(GTK_CONTAINER(vbox), box);
+ }
+
+
buttons[i] = gtk_check_button_new_with_label(debug_levels[i].name);
gtk_widget_set_tooltip_text(buttons[i], debug_levels[i].help);
gtk_box_pack_start(GTK_BOX(box), buttons[i], FALSE, FALSE, 6);
fio_debug |= (1UL << i);
}
+ 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);
}
static void about_dialog(GtkWidget *w, gpointer data)
{
+ const char *authors[] = {
+ "Jens Axboe <axboe@kernel.dk>",
+ "Stephen Carmeron <stephenmcameron@gmail.com>",
+ NULL
+ };
+ const char *license[] = {
+ "Fio is free software; you can redistribute it and/or modify "
+ "it under the terms of the GNU General Public License as published by "
+ "the Free Software Foundation; either version 2 of the License, or "
+ "(at your option) any later version.\n",
+ "Fio is distributed in the hope that it will be useful, "
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
+ "GNU General Public License for more details.\n",
+ "You should have received a copy of the GNU General Public License "
+ "along with Fio; if not, write to the Free Software Foundation, Inc., "
+ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n"
+ };
+ char *license_trans;
+
+ license_trans = g_strconcat(license[0], "\n", license[1], "\n",
+ license[2], "\n", NULL);
+
gtk_show_about_dialog(NULL,
"program-name", "gfio",
"comments", "Gtk2 UI for fio",
- "license", "GPLv2",
+ "license", license_trans,
+ "website", "http://git.kernel.dk/?p=fio.git;a=summary",
+ "authors", authors,
"version", fio_version_string,
- "copyright", "Jens Axboe <axboe@kernel.dk> 2012",
+ "copyright", "© 2012 Jens Axboe <axboe@kernel.dk>",
"logo-icon-name", "fio",
/* Must be last: */
- NULL, NULL,
+ "wrap-license", TRUE,
NULL);
+
+ 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) },
};
<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\"> \
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");
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");
}
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;
+ 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, 500);
+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, &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, ARRAYSIZE(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");
#endif
/*
- * Add a text box for text op messages
+ * Set up a drawing area and IOPS and bandwidth graphs
*/
- ui->textview = gtk_text_view_new();
- ui->text = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ui->textview));
- gtk_text_buffer_set_text(ui->text, "", -1);
- gtk_text_view_set_editable(GTK_TEXT_VIEW(ui->textview), FALSE);
- gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(ui->textview), FALSE);
- 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, &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_container_add(GTK_CONTAINER(ui->scrolled_window), ui->textview);
- 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_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
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(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 *data,
+ guint info, guint time)
+{
+ struct gui *ui = &main_ui;
+ gchar **uris;
+ GtkWidget *source;
+ int i;
+
+ 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(data);
+ if (!uris) {
+ gtk_drag_finish(ctx, FALSE, FALSE, time);
+ return;
+ }
+
+ i = 0;
+ while (uris[i]) {
+ if (do_file_open_with_tab(ui, uris[i]))
+ break;
+ i++;
+ }
+
+ 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", &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), NULL);
+ g_signal_connect(ui->window, "destroy", G_CALLBACK(quit_clicked), NULL);
+
+ ui->vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(ui->window), ui->vbox);
+
+ 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, 0, 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);
if (fio_init_options())
return 1;
- init_ui(&argc, &argv, &ui);
+ memset(&main_ui, 0, sizeof(main_ui));
+ INIT_FLIST_HEAD(&main_ui.list);
+
+ init_ui(&argc, &argv, &main_ui);
gdk_threads_enter();
gtk_main();
projects / fio.git / blobdiff