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;
}
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;
}
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,
.job_start = gfio_client_job_start,
.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)
+{
+ struct gui_entry *ge = data;
+
+ ge_destroy(ge);
+}
+
+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)
i++;
}
+ free(ge->job_files);
+ ge->job_files = NULL;
ge->nr_job_files = 0;
return ret;
}
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;
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);
return;
}
- gtk_main_quit();
+ gfio_quit(ui);
}
static void file_add_recent(struct gui *ui, const gchar *uri)
{
- gtk_recent_manager_add_item(ui->recentmanager, 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)
return 0;
}
-static void file_open(GtkWidget *w, gpointer data)
+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;
- int port, type, server_start, ge_is_new = 0;
+ 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
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_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
- if (ge_is_new)
- gtk_widget_destroy(ge->vbox);
-
gtk_widget_destroy(dialog);
return;
}
gtk_widget_destroy(dialog);
- if (get_connection_details(&host, &port, &type, &server_start)) {
- if (ge_is_new)
- gtk_widget_destroy(ge->vbox);
-
- goto done;
- }
-
filenames = fn_glist;
while (filenames != NULL) {
- do_file_open(ge, filenames->data, host, type, port);
- 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();
-done:
g_slist_free(fn_glist);
-
}
static void file_save(GtkWidget *w, gpointer data)
return TRUE;
}
-static void recent_open(GtkAction *action, gpointer data)
-{
- struct gui *ui = (struct gui *) data;
- int port, type, server_start;
- struct gui_entry *ge;
- GtkRecentInfo *info;
- const gchar *uri;
- gint cur_page;
- char *host;
- int ret, ge_is_new = 0;
-
- /*
- * Creates new tab if current tab is the main window, or the
- * current tab already has a client.
- */
- cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(ui->notebook));
- ge = get_ge_from_page(cur_page, &ge_is_new);
- if (ge->client) {
- ge = get_new_ge_with_tab("Untitled");
- ge_is_new = 1;
- }
-
- gtk_notebook_set_current_page(GTK_NOTEBOOK(ui->notebook), ge->page_num);
-
- info = g_object_get_data(G_OBJECT(action), "gtk-recent-info");
- uri = gtk_recent_info_get_uri(info);
-
- if (get_connection_details(&host, &port, &type, &server_start)) {
- if (ge_is_new)
- gtk_widget_destroy(ge->vbox);
-
- return;
- }
-
- 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);
- }
-}
-
static gint compare_recent_items(GtkRecentInfo *a, GtkRecentInfo *b)
{
time_t time_a = gtk_recent_info_get_visited(a);
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;
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