X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=90d968aaab869f320d8710b9b0fa763ad59ec332;hp=51bac2aa8e864577a5aa35f33aebebdccf1e74e9;hb=814479d5805f49a5c44263c61848874a92dc1caf;hpb=78cb2fe5769be13ea9d9fda62a97981c9ee44341

diff --git a/gfio.c b/gfio.c
index 51bac2aa..90d968aa 100644
--- a/gfio.c
+++ b/gfio.c
@@ -32,9 +32,12 @@
 #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 GdkColor white;
 
 static void view_log(GtkWidget *w, gpointer data);
 
@@ -105,15 +108,14 @@ struct gfio_graphs {
  */
 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;
@@ -148,19 +150,18 @@ struct gui_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;
 	GtkWidget *results_notebook;
 	GtkWidget *results_window;
+	GtkUIManager *results_uimanager;
+	GtkWidget *results_vbox;
+	GtkWidget *results_menu;
 	GtkListStore *log_model;
 	GtkWidget *log_tree;
 	GtkWidget *log_view;
@@ -190,70 +191,36 @@ static void gfio_update_thread_status(struct gui_entry *ge, char *status_message
 static void gfio_update_thread_status_all(char *status_message, double perc);
 void report_error(GError *error);
 
-static void iops_graph_y_axis_unit_change(struct graph *g, int power_of_ten)
-{
-	switch (power_of_ten) {
-		case 9: graph_y_title(g, "Billions of IOs / sec");
-			break;
-		case 6: graph_y_title(g, "Millions of IOs / sec");
-			break;
-		case 3: graph_y_title(g, "Thousands of IOs / sec");
-			break;
-		case 0:
-		default: graph_y_title(g, "IOs / sec");
-			break;
-	}
-}
-
 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, gfio_graph_limit);
-	graph_y_axis_unit_change_notify(g, iops_graph_y_axis_unit_change);
-	graph_add_extra_space(g, 0.005, 0.005, 0.03, 0.03);
+	graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0);
 	return g;
 }
 
-static void bandwidth_graph_y_axis_unit_change(struct graph *g, int power_of_ten)
-{
-	switch (power_of_ten) {
-		case 9: graph_y_title(g, "Petabytes / sec");
-			break;
-		case 6: graph_y_title(g, "Gigabytes / sec");
-			break;
-		case 3: graph_y_title(g, "Megabytes / sec");
-			break;
-		case 0:
-		default: graph_y_title(g, "Kilobytes / sec");
-			break;
-	}
-}
-
 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");
+	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_y_axis_unit_change_notify(g, bandwidth_graph_y_axis_unit_change);
-	graph_add_extra_space(g, 0.005, 0.005, 0.03, 0.03);
-
+	graph_add_extra_space(g, 0.0, 0.0, 0.0, 0.0);
 	return g;
 }
 
@@ -488,25 +455,18 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
 	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");
-	if (w)
-		gtk_widget_set_sensitive(w, connect_state);
+	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");
-	if (w)
-		gtk_widget_set_sensitive(w, edit_state);
+	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");
-	if (w)
-		gtk_widget_set_sensitive(w, send_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");
-	if (w)
-		gtk_widget_set_sensitive(w, start_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)
@@ -1074,9 +1034,55 @@ static gboolean results_window_delete(GtkWidget *w, gpointer data)
 	return TRUE;
 }
 
+static void results_close(GtkWidget *w, gpointer *data)
+{
+	struct gui_entry *ge = (struct gui_entry *) data;
+
+	gtk_widget_destroy(ge->results_window);
+}
+
+static GtkActionEntry results_menu_items[] = {
+	{ "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
+	{ "GraphMenuAction", GTK_STOCK_FILE, "Graph", NULL, NULL, NULL},
+	{ "CloseFile", GTK_STOCK_CLOSE, "Close", "<Control>W", NULL, G_CALLBACK(results_close) },
+};
+static gint results_nmenu_items = sizeof(results_menu_items) / sizeof(results_menu_items[0]);
+
+static const gchar *results_ui_string = " \
+	<ui> \
+		<menubar name=\"MainMenu\"> \
+			<menu name=\"FileMenu\" action=\"FileMenuAction\"> \
+				<menuitem name=\"Close\" action=\"CloseFile\" /> \
+			</menu> \
+			<menu name=\"GraphMenu\" action=\"GraphMenuAction\"> \
+			</menu>\
+		</menubar> \
+	</ui> \
+";
+
+static GtkWidget *get_results_menubar(GtkWidget *window, struct gui_entry *ge)
+{
+	GtkActionGroup *action_group;
+	GtkWidget *widget;
+	GError *error = 0;
+
+	ge->results_uimanager = gtk_ui_manager_new();
+
+	action_group = gtk_action_group_new("ResultsMenu");
+	gtk_action_group_add_actions(action_group, results_menu_items, results_nmenu_items, ge);
+
+	gtk_ui_manager_insert_action_group(ge->results_uimanager, action_group, 0);
+	gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ge->results_uimanager), results_ui_string, -1, &error);
+
+	gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ge->results_uimanager));
+
+	widget = gtk_ui_manager_get_widget(ge->results_uimanager, "/MainMenu");
+	return widget;
+}
+
 static GtkWidget *get_results_window(struct gui_entry *ge)
 {
-	GtkWidget *win, *notebook;
+	GtkWidget *win, *notebook, *vbox;
 
 	if (ge->results_window)
 		return ge->results_notebook;
@@ -1087,10 +1093,16 @@ static GtkWidget *get_results_window(struct gui_entry *ge)
 	g_signal_connect(win, "delete-event", G_CALLBACK(results_window_delete), ge);
 	g_signal_connect(win, "destroy", G_CALLBACK(results_window_delete), ge);
 
+	vbox = gtk_vbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(win), vbox);
+
+	ge->results_menu = get_results_menubar(win, ge);
+	gtk_box_pack_start(GTK_BOX(vbox), ge->results_menu, FALSE, FALSE, 0);
+
 	notebook = gtk_notebook_new();
 	gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), 1);
 	gtk_notebook_popup_enable(GTK_NOTEBOOK(notebook));
-	gtk_container_add(GTK_CONTAINER(win), notebook);
+	gtk_container_add(GTK_CONTAINER(vbox), notebook);
 
 	ge->results_window = win;
 	ge->results_notebook = notebook;
@@ -1307,12 +1319,39 @@ static void draw_graph(struct graph *g, cairo_t *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);
@@ -1393,10 +1432,10 @@ static void gfio_update_client_eta(struct fio_client *client, struct jobs_eta *j
 		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]);
@@ -1481,10 +1520,10 @@ static void gfio_update_all_eta(struct jobs_eta *je)
 		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]);
@@ -1558,7 +1597,7 @@ static void gfio_update_thread_status_all(char *status_message, double perc)
 	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;
 
@@ -1649,8 +1688,14 @@ static void gfio_client_job_start(struct fio_client *client, struct fio_net_cmd
 	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,
@@ -1663,14 +1708,50 @@ struct client_ops gfio_client_ops = {
 	.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)
@@ -1709,6 +1790,9 @@ static int send_job_files(struct gui_entry *ge)
 		i++;
 	}
 
+	free(ge->job_files);
+	ge->job_files = NULL;
+	ge->nr_job_files = 0;
 	return ret;
 }
 
@@ -2017,25 +2101,6 @@ static struct gui_entry *alloc_new_gui_entry(struct gui *ui)
 	return ge;
 }
 
-/*
- * FIXME: need more handling here
- */
-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 struct gui_entry *get_new_ge_with_tab(const char *name)
 {
 	struct gui_entry *ge;
@@ -2043,7 +2108,7 @@ static struct gui_entry *get_new_ge_with_tab(const char *name)
 	ge = alloc_new_gui_entry(&main_ui);
 
 	ge->vbox = new_client_page(ge);
-	g_signal_connect(ge->vbox, "destroy", G_CALLBACK(ge_destroy), 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);
@@ -2065,13 +2130,19 @@ static void file_new(GtkWidget *w, gpointer data)
  * 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)
+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);
@@ -2092,7 +2163,7 @@ static struct gui_entry *get_ge_from_cur_tab(struct gui *ui)
 	 */
 	cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook));
 	if (cur_page)
-		return get_ge_from_page(cur_page);
+		return get_ge_from_page(cur_page, NULL);
 
 	return NULL;
 }
@@ -2111,31 +2182,126 @@ static void file_close(GtkWidget *w, gpointer data)
 		return;
 	}
 
-	show_info_dialog(ui, "Error", "The main page view cannot be closed\n");
+	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_open(GtkWidget *w, gpointer data)
+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,
@@ -2148,7 +2314,7 @@ static void file_open(GtkWidget *w, gpointer data)
 	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);
 
@@ -2161,36 +2327,13 @@ static void file_open(GtkWidget *w, gpointer data)
 
 	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);
 }
 
@@ -2509,7 +2652,7 @@ static void set_job_menu_visible(struct gui *ui, int visible)
 static GtkWidget *get_menubar_menu(GtkWidget *window, GtkUIManager *ui_manager,
 				   struct gui *ui)
 {
-	GtkActionGroup *action_group = gtk_action_group_new("Menu");
+	GtkActionGroup *action_group;
 	GError *error = 0;
 
 	action_group = gtk_action_group_new("Menu");
@@ -2553,14 +2696,14 @@ static void combo_entry_destroy(GtkWidget *widget, gpointer data)
 static GtkWidget *new_client_page(struct gui_entry *ge)
 {
 	GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
-	GdkColor white;
+	GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
 
 	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);
@@ -2610,7 +2753,6 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
 	/*
 	 * Set up a drawing area and IOPS and bandwidth graphs
 	 */
-	gdk_color_parse("white", &white);
 	ge->graphs.drawing_area = gtk_drawing_area_new();
 	gtk_widget_set_size_request(GTK_WIDGET(ge->graphs.drawing_area),
 		DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
@@ -2619,13 +2761,12 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
 				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);
 
@@ -2633,11 +2774,10 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
 	 * 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));
 
@@ -2656,7 +2796,7 @@ static GtkWidget *new_client_page(struct gui_entry *ge)
 static GtkWidget *new_main_page(struct gui *ui)
 {
 	GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
-	GdkColor white;
+	GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
 
 	main_vbox = gtk_vbox_new(FALSE, 3);
 
@@ -2664,10 +2804,10 @@ static GtkWidget *new_main_page(struct gui *ui)
 	 * 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);
@@ -2699,7 +2839,6 @@ static GtkWidget *new_main_page(struct gui *ui)
 	/*
 	 * Set up a drawing area and IOPS and bandwidth graphs
 	 */
-	gdk_color_parse("white", &white);
 	ui->graphs.drawing_area = gtk_drawing_area_new();
 	gtk_widget_set_size_request(GTK_WIDGET(ui->graphs.drawing_area),
 		DRAWING_AREA_XDIM, DRAWING_AREA_YDIM);
@@ -2708,12 +2847,12 @@ static GtkWidget *new_main_page(struct gui *ui)
 			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);
@@ -2722,11 +2861,10 @@ static GtkWidget *new_main_page(struct gui *ui)
 	 * 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
@@ -2752,13 +2890,123 @@ static gboolean notebook_switch_page(GtkNotebook *notebook, GtkWidget *widget,
 	}
 
 	set_job_menu_visible(ui, 1);
-	ge = get_ge_from_page(page);
+	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;
@@ -2776,9 +3024,10 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
 	settings = gtk_settings_get_default();
 	gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "gfio setting");
 	g_type_init();
+	gdk_color_parse("white", &white);
 	
 	ui->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        gtk_window_set_title(GTK_WINDOW(ui->window), "fio");
+	gtk_window_set_title(GTK_WINDOW(ui->window), "fio");
 	gtk_window_set_default_size(GTK_WINDOW(ui->window), 1024, 768);
 
 	g_signal_connect(ui->window, "delete-event", G_CALLBACK(quit_clicked), NULL);
@@ -2791,6 +3040,9 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
 	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);
@@ -2798,6 +3050,9 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
 	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"));