X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=fc220f5da64923f40ec629e224e78562754d0bc6;hp=57a333b3c260ac943dd1b8203b51d5fcaee2b05a;hb=d8fbeefb67641e9f63088b329de78a26a69fdbae;hpb=3af452010d32267d085ba1612ebc0a40812c28a9 diff --git a/gfio.c b/gfio.c index 57a333b3..fc220f5d 100644 --- a/gfio.c +++ b/gfio.c @@ -32,6 +32,8 @@ #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; @@ -105,15 +107,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,14 +149,10 @@ 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; @@ -190,70 +187,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; } @@ -493,20 +456,17 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge) * 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); + 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); + 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); + gtk_widget_set_sensitive(w, start_state); } static void gfio_set_state(struct gui_entry *ge, unsigned int state) @@ -1736,6 +1696,8 @@ 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; } @@ -2093,13 +2055,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); @@ -2120,7 +2088,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; } @@ -2147,28 +2115,118 @@ static void file_close(GtkWidget *w, gpointer data) gtk_main_quit(); } -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, @@ -2181,7 +2239,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); @@ -2194,36 +2252,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); } @@ -2586,14 +2621,15 @@ 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; + 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); @@ -2652,13 +2688,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); @@ -2666,11 +2701,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)); @@ -2689,6 +2723,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; + GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox; GdkColor white; main_vbox = gtk_vbox_new(FALSE, 3); @@ -2697,10 +2732,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); @@ -2741,12 +2776,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); @@ -2755,11 +2790,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 @@ -2785,13 +2819,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; @@ -2824,6 +2968,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); @@ -2831,6 +2978,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"));