#include "fio.h"
#include "graph.h"
+#define GFIO_MIME "text/fio"
+
static int gfio_server_running;
static const char *gfio_graph_font;
+static unsigned int gfio_graph_limit = 100;
-static void gfio_update_thread_status(char *status_message, double perc);
static void view_log(GtkWidget *w, gpointer data);
#define ARRAYSIZE(x) (sizeof((x)) / (sizeof((x)[0])))
GtkWidget *fio_ver;
};
+struct multitext_widget {
+ GtkWidget *entry;
+ char **text;
+ unsigned int cur_text;
+ unsigned int max_text;
+};
+
struct eta_widget {
- GtkWidget *name;
- GtkWidget *iotype;
- GtkWidget *ioengine;
- GtkWidget *iodepth;
+ GtkWidget *names;
+ struct multitext_widget iotype;
+ struct multitext_widget ioengine;
+ struct multitext_widget iodepth;
GtkWidget *jobs;
GtkWidget *files;
GtkWidget *read_bw;
#define DRAWING_AREA_XDIM 1000
#define DRAWING_AREA_YDIM 400
GtkWidget *drawing_area;
- int drawing_area_xdim;
- int drawing_area_ydim;
-
struct graph *iops_graph;
struct graph *bandwidth_graph;
};
* Main window widgets and data
*/
struct gui {
+ GtkUIManager *uimanager;
+ GtkRecentManager *recentmanager;
+ GtkActionGroup *actiongroup;
+ guint recent_ui_id;
+ GtkWidget *menu;
GtkWidget *window;
GtkWidget *vbox;
- GtkWidget *topvbox;
- GtkWidget *topalign;
- GtkWidget *bottomalign;
GtkWidget *thread_status_pb;
GtkWidget *buttonbox;
- GtkWidget *scrolled_window;
GtkWidget *notebook;
GtkWidget *error_info_bar;
GtkWidget *error_label;
struct flist_head list;
} main_ui;
+enum {
+ GE_STATE_NEW = 1,
+ GE_STATE_CONNECTED,
+ GE_STATE_JOB_SENT,
+ GE_STATE_JOB_STARTED,
+ GE_STATE_JOB_RUNNING,
+ GE_STATE_JOB_DONE,
+};
+
/*
* Notebook entry
*/
struct gui *ui;
GtkWidget *vbox;
- GtkWidget *topvbox;
- GtkWidget *topalign;
- GtkWidget *bottomalign;
+ GtkWidget *job_notebook;
GtkWidget *thread_status_pb;
GtkWidget *buttonbox;
GtkWidget *button[ARRAYSIZE(buttonspeclist)];
- GtkWidget *scrolled_window;
GtkWidget *notebook;
GtkWidget *error_info_bar;
GtkWidget *error_label;
struct eta_widget eta;
GtkWidget *page_label;
gint page_num;
- int connected;
+ unsigned int state;
struct gfio_client *client;
int nr_job_files;
struct thread_options o;
};
+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);
+void report_error(GError *error);
+
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");
+ graph_title(g, "IOPS (IOs/sec)");
graph_x_title(g, "Time (secs)");
- graph_y_title(g, "IOs / sec");
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, 100);
+ 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 graph *g;
g = graph_new(DRAWING_AREA_XDIM / 2.0, DRAWING_AREA_YDIM, gfio_graph_font);
- graph_title(g, "Bandwidth");
+ graph_title(g, "Bandwidth (bytes/sec)");
graph_x_title(g, "Time (secs)");
- graph_y_title(g, "Kbytes / sec");
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;
}
g->bandwidth_graph = setup_bandwidth_graph();
}
+static void multitext_add_entry(struct multitext_widget *mt, const char *text)
+{
+ mt->text = realloc(mt->text, (mt->max_text + 1) * sizeof(char *));
+ mt->text[mt->max_text] = strdup(text);
+ mt->max_text++;
+}
+
+static void multitext_set_entry(struct multitext_widget *mt, unsigned int index)
+{
+ if (index >= mt->max_text)
+ return;
+ if (!mt->text || !mt->text[index])
+ return;
+
+ mt->cur_text = index;
+ gtk_entry_set_text(GTK_ENTRY(mt->entry), mt->text[index]);
+}
+
+static void multitext_update_entry(struct multitext_widget *mt,
+ unsigned int index, const char *text)
+{
+ if (!mt->text)
+ return;
+
+ if (mt->text[index])
+ free(mt->text[index]);
+
+ mt->text[index] = strdup(text);
+ if (mt->cur_text == index)
+ gtk_entry_set_text(GTK_ENTRY(mt->entry), mt->text[index]);
+}
+
+static void multitext_free(struct multitext_widget *mt)
+{
+ int i;
+
+ gtk_entry_set_text(GTK_ENTRY(mt->entry), "");
+
+ for (i = 0; i < mt->max_text; i++) {
+ if (mt->text[i])
+ free(mt->text[i]);
+ }
+
+ free(mt->text);
+ mt->cur_text = -1;
+ mt->max_text = 0;
+}
+
static void clear_ge_ui_info(struct gui_entry *ge)
{
gtk_label_set_text(GTK_LABEL(ge->probe.hostname), "");
gtk_label_set_text(GTK_LABEL(ge->probe.os), "");
gtk_label_set_text(GTK_LABEL(ge->probe.arch), "");
gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), "");
+#if 0
+ /* should we empty it... */
gtk_entry_set_text(GTK_ENTRY(ge->eta.name), "");
- gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), "");
- gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), "");
- gtk_entry_set_text(GTK_ENTRY(ge->eta.iodepth), "");
+#endif
+ multitext_update_entry(&ge->eta.iotype, 0, "");
+ multitext_update_entry(&ge->eta.ioengine, 0, "");
+ multitext_update_entry(&ge->eta.iodepth, 0, "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.jobs), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.files), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.read_bw), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), "");
}
+static GtkWidget *new_combo_entry_in_frame(GtkWidget *box, const char *label)
+{
+ GtkWidget *entry, *frame;
+
+ frame = gtk_frame_new(label);
+ entry = gtk_combo_box_new_text();
+ gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 3);
+ gtk_container_add(GTK_CONTAINER(frame), entry);
+
+ return entry;
+}
+
static GtkWidget *new_info_entry_in_frame(GtkWidget *box, const char *label)
{
GtkWidget *entry, *frame;
return button;
}
-static void gfio_set_connected(struct gui_entry *ge, int connected)
-{
- if (connected) {
- gtk_widget_set_sensitive(ge->button[SEND_BUTTON], 1);
- ge->connected = 1;
- gtk_button_set_label(GTK_BUTTON(ge->button[CONNECT_BUTTON]), "Disconnect");
- gtk_widget_set_sensitive(ge->button[CONNECT_BUTTON], 1);
- } else {
- ge->connected = 0;
- gtk_button_set_label(GTK_BUTTON(ge->button[CONNECT_BUTTON]), "Connect");
- gtk_widget_set_sensitive(ge->button[SEND_BUTTON], 0);
- gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], 0);
- gtk_widget_set_sensitive(ge->button[CONNECT_BUTTON], 1);
- }
-}
-
static void label_set_int_value(GtkWidget *entry, unsigned int val)
{
char tmp[80];
gtk_entry_set_text(GTK_ENTRY(entry), tmp);
}
+static void show_info_dialog(struct gui *ui, const char *title,
+ const char *message)
+{
+ GtkWidget *dialog, *content, *label;
+
+ dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(ui->window),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+
+ content = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+ label = gtk_label_new(message);
+ gtk_container_add(GTK_CONTAINER(content), label);
+ gtk_widget_show_all(dialog);
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+}
+
+/*
+ * 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;
+ GtkWidget *w;
+
+ 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 = 0;
+ connect_str = "Connect";
+ send_state = 0;
+ start_state = 0;
+ break;
+ case GE_STATE_CONNECTED:
+ connect_state = 1;
+ edit_state = 0;
+ connect_str = "Disconnect";
+ send_state = 1;
+ start_state = 0;
+ break;
+ case GE_STATE_JOB_SENT:
+ connect_state = 1;
+ edit_state = 0;
+ connect_str = "Disconnect";
+ send_state = 0;
+ start_state = 1;
+ break;
+ case GE_STATE_JOB_STARTED:
+ connect_state = 1;
+ edit_state = 1;
+ connect_str = "Disconnect";
+ send_state = 0;
+ start_state = 1;
+ break;
+ case GE_STATE_JOB_RUNNING:
+ connect_state = 1;
+ edit_state = 0;
+ connect_str = "Disconnect";
+ send_state = 0;
+ start_state = 0;
+ break;
+ case GE_STATE_JOB_DONE:
+ connect_state = 1;
+ edit_state = 0;
+ connect_str = "Connect";
+ send_state = 0;
+ start_state = 0;
+ break;
+ }
+
+ gtk_widget_set_sensitive(ge->button[CONNECT_BUTTON], connect_state);
+ gtk_widget_set_sensitive(ge->button[SEND_BUTTON], send_state);
+ gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], start_state);
+ gtk_button_set_label(GTK_BUTTON(ge->button[CONNECT_BUTTON]), connect_str);
+
+ /*
+ * So the below doesn't work at all, how to set those menu items
+ * invisibible...
+ */
+ w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Connect");
+ gtk_widget_set_sensitive(w, connect_state);
+ gtk_menu_item_set_label(GTK_MENU_ITEM(w), connect_str);
+
+ w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Edit job");
+ gtk_widget_set_sensitive(w, edit_state);
+
+ w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Send job");
+ gtk_widget_set_sensitive(w, send_state);
+
+ w = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu/Start job");
+ gtk_widget_set_sensitive(w, start_state);
+}
+
+static void gfio_set_state(struct gui_entry *ge, unsigned int state)
+{
+ ge->state = state;
+ update_button_states(ge->ui, ge);
+}
+
#define ALIGN_LEFT 1
#define ALIGN_RIGHT 2
#define INVISIBLE 4
g_signal_connect(win, "destroy", G_CALLBACK(results_window_delete), ge);
notebook = gtk_notebook_new();
+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), 1);
+ gtk_notebook_popup_enable(GTK_NOTEBOOK(notebook));
gtk_container_add(GTK_CONTAINER(win), notebook);
ge->results_window = win;
{
struct gfio_graphs *g = data;
- g->drawing_area_xdim = w->allocation.width;
- g->drawing_area_ydim = w->allocation.height;
+ graph_set_size(g->iops_graph, w->allocation.width / 2.0, w->allocation.height);
+ graph_set_position(g->iops_graph, w->allocation.width / 2.0, 0.0);
+ graph_set_size(g->bandwidth_graph, w->allocation.width / 2.0, w->allocation.height);
+ graph_set_position(g->bandwidth_graph, 0, 0);
return TRUE;
}
+static void draw_graph(struct graph *g, cairo_t *cr)
+{
+ line_graph_draw(g, cr);
+ cairo_stroke(cr);
+}
+
+static 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;
- graph_set_size(g->iops_graph, g->drawing_area_xdim / 2.0,
- g->drawing_area_ydim);
- graph_set_size(g->bandwidth_graph, g->drawing_area_xdim / 2.0,
- g->drawing_area_ydim);
cr = gdk_cairo_create(w->window);
- cairo_set_source_rgb(cr, 0, 0, 0);
-
- cairo_save(cr);
- cairo_translate(cr, 0, 0);
- line_graph_draw(g->bandwidth_graph, cr);
- cairo_stroke(cr);
- cairo_restore(cr);
+ if (graph_has_tooltips(g->iops_graph) ||
+ graph_has_tooltips(g->bandwidth_graph)) {
+ g_object_set(w, "has-tooltip", TRUE, NULL);
+ g_signal_connect(w, "query-tooltip", G_CALLBACK(graph_tooltip), g);
+ }
- cairo_save(cr);
- cairo_translate(cr, g->drawing_area_xdim / 2.0, 0);
- line_graph_draw(g->iops_graph, cr);
- cairo_stroke(cr);
- cairo_restore(cr);
+ cairo_set_source_rgb(cr, 0, 0, 0);
+ draw_graph(g->iops_graph, cr);
+ draw_graph(g->bandwidth_graph, cr);
cairo_destroy(cr);
return FALSE;
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]);
- graph_add_xy_data(ge->graphs.iops_graph, "Write IOPS", je->elapsed_sec, je->iops[1]);
- graph_add_xy_data(ge->graphs.bandwidth_graph, "Read Bandwidth", je->elapsed_sec, je->rate[0]);
- graph_add_xy_data(ge->graphs.bandwidth_graph, "Write Bandwidth", je->elapsed_sec, je->rate[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();
}
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];
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]);
- graph_add_xy_data(ui->graphs.iops_graph, "Write IOPS", je->elapsed_sec, je->iops[1]);
- graph_add_xy_data(ui->graphs.bandwidth_graph, "Read Bandwidth", je->elapsed_sec, je->rate[0]);
- graph_add_xy_data(ui->graphs.bandwidth_graph, "Write Bandwidth", je->elapsed_sec, je->rate[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]);
sprintf(dst, " - %s", eta_str);
}
- gfio_update_thread_status(output, perc);
+ gfio_update_thread_status_all(output, perc);
gdk_threads_leave();
}
sprintf(buf, "%u.%u.%u", probe->fio_major, probe->fio_minor, probe->fio_patch);
gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), buf);
- gfio_set_connected(ge, 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];
struct gfio_client *gc = client->client_data;
gdk_threads_enter();
- gfio_set_connected(gc->ge, 0);
+ gfio_set_state(gc->ge, GE_STATE_NEW);
gdk_threads_leave();
}
gtk_label_set_text(GTK_LABEL(ge->page_label), (gchar *) o->name);
- gtk_entry_set_text(GTK_ENTRY(ge->eta.name), (gchar *) o->name);
- gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), ddir_str(o->td_ddir));
- gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), (gchar *) o->ioengine);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(ge->eta.names), (gchar *) o->name);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(ge->eta.names), 0);
+
+ multitext_add_entry(&ge->eta.iotype, ddir_str(o->td_ddir));
+ multitext_add_entry(&ge->eta.ioengine, (const char *) o->ioengine);
sprintf(tmp, "%u", o->iodepth);
- gtk_entry_set_text(GTK_ENTRY(ge->eta.iodepth), tmp);
+ multitext_add_entry(&ge->eta.iodepth, tmp);
+
+ multitext_set_entry(&ge->eta.iotype, 0);
+ multitext_set_entry(&ge->eta.ioengine, 0);
+ multitext_set_entry(&ge->eta.iodepth, 0);
gc->job_added++;
+ 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->ge, 0);
+ 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);
-
- dialog = gtk_dialog_new_with_buttons("Timed out!",
- GTK_WINDOW(main_ui.window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
-
- /* gtk_dialog_get_content_area() is 2.14 and newer */
- content = GTK_DIALOG(dialog)->vbox;
-
- label = gtk_label_new((const gchar *) buf);
- gtk_container_add(GTK_CONTAINER(content), label);
- gtk_widget_show_all(dialog);
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
-
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ show_info_dialog(gc->ge->ui, "Network timeout", buf);
gdk_threads_leave();
}
gdk_threads_enter();
- gfio_set_connected(gc->ge, 0);
+ 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();
+}
+
struct client_ops gfio_client_ops = {
.text_op = gfio_text_op,
.disk_util = gfio_disk_util_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,
+ .eta_msec = FIO_CLIENT_DEF_ETA_MSEC,
.stay_connected = 1,
};
static int send_job_files(struct gui_entry *ge)
{
+ struct gfio_client *gc = ge->client;
int i, ret = 0;
for (i = 0; i < ge->nr_job_files; i++) {
- ret = fio_clients_send_ini(ge->job_files[i]);
- if (ret)
+ 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(ge->job_files[i]);
i++;
}
+ free(ge->job_files);
+ ge->job_files = NULL;
+ ge->nr_job_files = 0;
return ret;
}
struct gui_entry *ge = data;
struct gfio_client *gc = ge->client;
- gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], 0);
- fio_start_client(gc->client);
+ if (gc)
+ fio_start_client(gc->client);
}
static void file_open(GtkWidget *w, gpointer data);
struct gui_entry *ge = data;
struct gfio_client *gc = ge->client;
- if (!ge->connected) {
+ if (ge->state == GE_STATE_NEW) {
+ int ret;
+
if (!ge->nr_job_files)
- file_open(widget, data);
+ file_open(widget, ge->ui);
if (!ge->nr_job_files)
return;
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);
- if (!fio_client_connect(gc->client)) {
+ ret = fio_client_connect(gc->client);
+ if (!ret) {
if (!ge->ui->handler_running)
pthread_create(&ge->ui->t, NULL, job_thread, ge->ui);
- gtk_widget_set_sensitive(ge->button[CONNECT_BUTTON], 0);
- gtk_widget_set_sensitive(ge->button[SEND_BUTTON], 1);
+ gfio_set_state(ge, GE_STATE_CONNECTED);
+ } else {
+ GError *error;
+
+ 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_client_terminate(gc->client);
- gfio_set_connected(ge, 0);
+ gfio_set_state(ge, GE_STATE_NEW);
clear_ge_ui_info(ge);
}
}
struct gui_entry *ge = data;
if (send_job_files(ge)) {
- printf("Yeah, I didn't really like those options too much.\n");
+ GError *error;
+
+ 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[START_JOB_BUTTON], 1);
}
-
- gtk_widget_set_sensitive(ge->button[SEND_BUTTON], 0);
- gtk_widget_set_sensitive(ge->button[START_JOB_BUTTON], 1);
}
static GtkWidget *add_button(GtkWidget *buttonbox,
gc = malloc(sizeof(*gc));
memset(gc, 0, sizeof(*gc));
gc->ge = ge;
- gc->client = client;
+ gc->client = fio_get_client(client);
ge->client = gc;
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;
static void ge_destroy(GtkWidget *w, gpointer data)
{
struct gui_entry *ge = data;
+ 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 file_new(GtkWidget *w, gpointer data)
{
- get_new_ge_with_tab("Untitled");
+ struct gui *ui = (struct gui *) data;
+ struct gui_entry *ge;
+
+ ge = get_new_ge_with_tab("Untitled");
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num);
}
/*
* 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(unsigned int cur_page)
+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 (!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);
return NULL;
}
-static void file_open(GtkWidget *w, gpointer data)
+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;
+ }
+
+ gtk_main_quit();
+}
+
+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)
{
- struct gui *ui = data;
- GtkWidget *dialog;
- GSList *filenames, *fn_glist;
- GtkFileFilter *filter;
- char *host;
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);
- if (ge->client)
+ 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);
+
+ free(host);
+
+ if (!ret) {
+ if (server_start)
+ gfio_start_server();
+ } else {
+ if (ge_is_new)
+ gtk_widget_destroy(ge->vbox);
+ }
+
+ return ret;
+}
+
+static void recent_open(GtkAction *action, gpointer data)
+{
+ struct gui *ui = (struct gui *) data;
+ GtkRecentInfo *info;
+ const gchar *uri;
+
+ info = g_object_get_data(G_OBJECT(action), "gtk-recent-info");
+ uri = gtk_recent_info_get_uri(info);
+
+ do_file_open_with_tab(ui, uri);
+}
+
+static void file_open(GtkWidget *w, gpointer data)
+{
+ struct gui *ui = data;
+ GtkWidget *dialog;
+ GSList *filenames, *fn_glist;
+ GtkFileFilter *filter;
+
dialog = gtk_file_chooser_dialog_new("Open File",
GTK_WINDOW(ui->window),
GTK_FILE_CHOOSER_ACTION_OPEN,
gtk_file_filter_add_pattern(filter, "*.fio");
gtk_file_filter_add_pattern(filter, "*.job");
gtk_file_filter_add_pattern(filter, "*.ini");
- gtk_file_filter_add_mime_type(filter, "text/fio");
+ gtk_file_filter_add_mime_type(filter, GFIO_MIME);
gtk_file_filter_set_name(filter, "Fio job file");
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
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;
-
- ge->job_files = realloc(ge->job_files, (ge->nr_job_files + 1) * sizeof(char *));
- ge->job_files[ge->nr_job_files] = strdup(filenames->data);
- 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);
- }
- gfio_client_added(ge, 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();
-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)
+{
+}
+
+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 __update_graph_limits(struct gfio_graphs *g)
+{
+ line_graph_set_data_count_limit(g->iops_graph, gfio_graph_limit);
+ line_graph_set_data_count_limit(g->bandwidth_graph, gfio_graph_limit);
+}
+
+static void update_graph_limits(void)
+{
+ struct flist_head *entry;
+ struct gui_entry *ge;
+
+ __update_graph_limits(&main_ui.graphs);
+
+ flist_for_each(entry, &main_ui.list) {
+ ge = flist_entry(entry, struct gui_entry, list);
+ __update_graph_limits(&ge->graphs);
+ }
+}
+
static void preferences(GtkWidget *w, gpointer data)
{
GtkWidget *dialog, *frame, *box, **buttons, *vbox, *font;
+ GtkWidget *hbox, *spin, *entry, *spin_int;
int i;
dialog = gtk_dialog_new_with_buttons("Preferences",
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
NULL);
- frame = gtk_frame_new("Debug logging");
+ frame = gtk_frame_new("Graphing");
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+ vbox = gtk_vbox_new(FALSE, 6);
+ gtk_container_add(GTK_CONTAINER(frame), vbox);
+
+ hbox = gtk_hbox_new(FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+ entry = gtk_label_new("Font face to use for graph labels");
+ gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 5);
+
+ font = gtk_font_button_new();
+ gtk_box_pack_start(GTK_BOX(hbox), font, FALSE, FALSE, 5);
+
+ box = gtk_vbox_new(FALSE, 6);
+ gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5);
+
+ hbox = gtk_hbox_new(FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, TRUE, 5);
+ entry = gtk_label_new("Maximum number of data points in graph (seconds)");
+ gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
+ spin = create_spinbutton(hbox, 10, 1000000, gfio_graph_limit);
+
+ box = gtk_vbox_new(FALSE, 6);
+ gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, FALSE, 5);
+
+ hbox = gtk_hbox_new(FALSE, 5);
+ gtk_box_pack_start(GTK_BOX(box), hbox, TRUE, TRUE, 5);
+ entry = gtk_label_new("Client ETA request interval (msec)");
+ gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
+
+ spin_int = create_spinbutton(hbox, 100, 100000, gfio_client_ops.eta_msec);
+ frame = gtk_frame_new("Debug logging");
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
vbox = gtk_vbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_box_pack_start(GTK_BOX(box), buttons[i], FALSE, FALSE, 6);
}
- frame = gtk_frame_new("Graph font");
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
- vbox = gtk_vbox_new(FALSE, 6);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
-
- font = gtk_font_button_new();
- gtk_box_pack_start(GTK_BOX(vbox), font, FALSE, FALSE, 5);
-
gtk_widget_show_all(dialog);
if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
}
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 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) },
+ { "ConnectJob", NULL, "Connect", "<Control>E", NULL, G_CALLBACK(connect_job_entry) },
+ { "EditJob", NULL, "Edit job", "<Control>E", NULL, G_CALLBACK(edit_job_entry) },
+ { "SendJob", NULL, "Send job", "<Control>X", NULL, G_CALLBACK(send_job_entry) },
+ { "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) },
};
<menubar name=\"MainMenu\"> \
<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
<menuitem name=\"New\" action=\"NewFile\" /> \
+ <menuitem name=\"Close\" action=\"CloseFile\" /> \
<separator name=\"Separator1\"/> \
<menuitem name=\"Open\" action=\"OpenFile\" /> \
<menuitem name=\"Save\" action=\"SaveFile\" /> \
<separator name=\"Separator2\"/> \
<menuitem name=\"Preferences\" action=\"Preferences\" /> \
<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=\"Log\" action=\"ViewLog\" /> \
</menu>\
</ui> \
";
+static void set_job_menu_visible(struct gui *ui, int visible)
+{
+ GtkWidget *job;
+
+ job = gtk_ui_manager_get_widget(ui->uimanager, "/MainMenu/JobMenu");
+ gtk_widget_set_sensitive(job, visible);
+}
+
static GtkWidget *get_menubar_menu(GtkWidget *window, GtkUIManager *ui_manager,
struct gui *ui)
{
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 combo_entry_changed(GtkComboBox *box, gpointer data)
+{
+ struct gui_entry *ge = (struct gui_entry *) data;
+ gint index;
+
+ index = gtk_combo_box_get_active(box);
+
+ multitext_set_entry(&ge->eta.iotype, index);
+ multitext_set_entry(&ge->eta.ioengine, index);
+ multitext_set_entry(&ge->eta.iodepth, index);
+}
+
+static void combo_entry_destroy(GtkWidget *widget, gpointer data)
+{
+ struct gui_entry *ge = (struct gui_entry *) data;
+
+ multitext_free(&ge->eta.iotype);
+ multitext_free(&ge->eta.ioengine);
+ multitext_free(&ge->eta.iodepth);
+}
+
static GtkWidget *new_client_page(struct gui_entry *ge)
{
GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
+ GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
GdkColor white;
main_vbox = gtk_vbox_new(FALSE, 3);
- ge->topalign = gtk_alignment_new(0, 0, 1, 0);
- ge->topvbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(ge->topalign), ge->topvbox);
- gtk_box_pack_start(GTK_BOX(main_vbox), ge->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(main_vbox), probe, FALSE, FALSE, 3);
probe_box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
- ge->eta.name = new_info_entry_in_frame(probe_box, "Name");
- ge->eta.iotype = new_info_entry_in_frame(probe_box, "IO");
- ge->eta.ioengine = new_info_entry_in_frame(probe_box, "IO Engine");
- ge->eta.iodepth = new_info_entry_in_frame(probe_box, "IO Depth");
+ ge->eta.names = new_combo_entry_in_frame(probe_box, "Jobs");
+ g_signal_connect(ge->eta.names, "changed", G_CALLBACK(combo_entry_changed), ge);
+ g_signal_connect(ge->eta.names, "destroy", G_CALLBACK(combo_entry_destroy), ge);
+ ge->eta.iotype.entry = new_info_entry_in_frame(probe_box, "IO");
+ ge->eta.ioengine.entry = new_info_entry_in_frame(probe_box, "IO Engine");
+ ge->eta.iodepth.entry = new_info_entry_in_frame(probe_box, "IO Depth");
ge->eta.jobs = new_info_entry_in_frame(probe_box, "Jobs");
ge->eta.files = new_info_entry_in_frame(probe_box, "Open files");
*/
gdk_color_parse("white", &white);
ge->graphs.drawing_area = gtk_drawing_area_new();
- ge->graphs.drawing_area_xdim = DRAWING_AREA_XDIM;
- ge->graphs.drawing_area_ydim = DRAWING_AREA_YDIM;
gtk_widget_set_size_request(GTK_WIDGET(ge->graphs.drawing_area),
- ge->graphs.drawing_area_xdim, ge->graphs.drawing_area_ydim);
+ DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
gtk_widget_modify_bg(ge->graphs.drawing_area, GTK_STATE_NORMAL, &white);
g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "expose_event",
G_CALLBACK(on_expose_drawing_area), &ge->graphs);
g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ge->graphs);
- ge->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ge->scrolled_window),
+ 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(ge->scrolled_window),
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
ge->graphs.drawing_area);
- gtk_box_pack_start(GTK_BOX(main_vbox), ge->scrolled_window,
- TRUE, TRUE, 0);
+ 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
*/
- ge->bottomalign = gtk_alignment_new(0, 1, 1, 0);
+ bottom_align = gtk_alignment_new(0, 1, 1, 0);
ge->buttonbox = gtk_hbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(ge->bottomalign), ge->buttonbox);
- gtk_box_pack_start(GTK_BOX(main_vbox), ge->bottomalign,
- FALSE, 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));
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;
GdkColor white;
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, 0);
- gtk_container_add(GTK_CONTAINER(ui->topalign), ui->topvbox);
- gtk_box_pack_start(GTK_BOX(main_vbox), ui->topalign, FALSE, FALSE, 0);
+ 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_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");
*/
gdk_color_parse("white", &white);
ui->graphs.drawing_area = gtk_drawing_area_new();
- ui->graphs.drawing_area_xdim = DRAWING_AREA_XDIM;
- ui->graphs.drawing_area_ydim = DRAWING_AREA_YDIM;
gtk_widget_set_size_request(GTK_WIDGET(ui->graphs.drawing_area),
- ui->graphs.drawing_area_xdim, ui->graphs.drawing_area_ydim);
+ DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
gtk_widget_modify_bg(ui->graphs.drawing_area, GTK_STATE_NORMAL, &white);
g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "expose_event",
G_CALLBACK(on_expose_drawing_area), &ui->graphs);
g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ui->graphs);
- ui->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui->scrolled_window),
+ scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(ui->scrolled_window),
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
ui->graphs.drawing_area);
- gtk_box_pack_start(GTK_BOX(main_vbox), ui->scrolled_window,
+ 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(main_vbox), ui->bottomalign,
- FALSE, FALSE, 0);
+ 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
guint page, gpointer data)
{
+ struct gui *ui = (struct gui *) data;
+ struct gui_entry *ge;
+
+ if (!page) {
+ set_job_menu_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;
- GtkUIManager *uimanager;
- GtkWidget *menu, *vbox;
+ GtkWidget *vbox;
/* Magical g*thread incantation, you just need this thread stuff.
* Without it, the update that happens in gfio_update_thread_status
ui->vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(ui->window), ui->vbox);
- uimanager = gtk_ui_manager_new();
- menu = get_menubar_menu(ui->window, uimanager, ui);
- gfio_ui_setup(settings, menu, ui->vbox, uimanager);
+ 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"));
projects / fio.git / blobdiff