X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=90d968aaab869f320d8710b9b0fa763ad59ec332;hp=980d70484d9ab242d8838418a96857dde410453b;hb=814479d5805f49a5c44263c61848874a92dc1caf;hpb=0fd18982b864987b59dc7bb1e7263a5a8fd73b02 diff --git a/gfio.c b/gfio.c index 980d7048..90d968aa 100644 --- a/gfio.c +++ b/gfio.c @@ -37,6 +37,7 @@ 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); @@ -158,6 +159,9 @@ struct gui_entry { 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; @@ -451,10 +455,6 @@ 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"); gtk_widget_set_sensitive(w, connect_state); gtk_menu_item_set_label(GTK_MENU_ITEM(w), connect_str); @@ -1034,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", "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 = " \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +"; + +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; @@ -1047,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; @@ -1545,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; @@ -1636,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, @@ -1650,8 +1708,10 @@ 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, }; /* @@ -1674,9 +1734,6 @@ static void ge_destroy(struct gui_entry *ge) static void ge_widget_destroy(GtkWidget *w, gpointer data) { - struct gui_entry *ge = data; - - ge_destroy(ge); } static void gfio_quit(struct gui *ui) @@ -2595,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"); @@ -2640,7 +2697,6 @@ 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); @@ -2697,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); @@ -2742,7 +2797,6 @@ 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); @@ -2785,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); @@ -2971,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);