X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gfio.c;h=d736a261aab8705a92a4fd6da2bf13802a62262f;hp=ed9b1f5148d14913e497fd33fbc4a2e6faecafd8;hb=25927259f482b0288d962e36dbfd33ec90a69521;hpb=8232e2855c87697a95d00d920d1fd11b30d0fcaa

diff --git a/gfio.c b/gfio.c
index ed9b1f51..d736a261 100644
--- a/gfio.c
+++ b/gfio.c
@@ -27,8 +27,6 @@
 #include "fio_initialization.h"
 #include "fio.h"
 
-static struct client_ops *gfio_client_ops = &fio_client_ops;
-
 #define ARRAYSIZE(x) (sizeof((x)) / (sizeof((x)[0])))
 
 typedef void (*clickfunction)(GtkWidget *widget, gpointer data);
@@ -53,6 +51,53 @@ struct gui {
 	GtkWidget *window;
 	GtkWidget *buttonbox;
 	GtkWidget *button[ARRAYSIZE(buttonspeclist)];
+	pthread_t t;
+};
+
+static void gfio_text_op(struct fio_client *client,
+                FILE *f, __u16 pdu_len, const char *buf)
+{
+	printf("gfio_text_op called\n");
+	fio_client_ops.text_op(client, f, pdu_len, buf);
+}
+
+static void gfio_disk_util_op(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+	printf("gfio_disk_util_op called\n");
+	fio_client_ops.disk_util(client, cmd);
+}
+
+static void gfio_thread_status_op(struct fio_net_cmd *cmd)
+{
+	printf("gfio_thread_status_op called\n");
+	fio_client_ops.thread_status(cmd);
+}
+
+static void gfio_group_stats_op(struct fio_net_cmd *cmd)
+{
+	printf("gfio_group_stats_op called\n");
+	fio_client_ops.group_stats(cmd);
+}
+
+static void gfio_eta_op(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+	printf("gfio_eta_op called\n");
+	fio_client_ops.eta(client, cmd);
+}
+
+static void gfio_probe_op(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+	printf("gfio_probe_op called\n");
+	fio_client_ops.probe(client, cmd);
+}
+
+struct client_ops gfio_client_ops = {
+	gfio_text_op,
+	gfio_disk_util_op,
+	gfio_thread_status_op,
+	gfio_group_stats_op,
+	gfio_eta_op,
+	gfio_probe_op,
 };
 
 static void quit_clicked(__attribute__((unused)) GtkWidget *widget,
@@ -61,10 +106,28 @@ static void quit_clicked(__attribute__((unused)) GtkWidget *widget,
         gtk_main_quit();
 }
 
+static void *job_thread(void *arg)
+{
+	struct gui *ui = arg;
+
+	fio_handle_clients(&gfio_client_ops);
+	gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 1);
+	return NULL;
+}
+
+static void start_job_thread(pthread_t *t, struct gui *ui)
+{
+	pthread_create(t, NULL, job_thread, ui);
+}
+
 static void start_job_clicked(__attribute__((unused)) GtkWidget *widget,
-                __attribute__((unused)) gpointer data)
+                gpointer data)
 {
+	struct gui *ui = data;
+
 	printf("Start job button was clicked.\n");
+	gtk_widget_set_sensitive(ui->button[START_JOB_BUTTON], 0);
+	start_job_thread(&ui->t, ui);
 }
 
 static void add_button(struct gui *ui, int i, GtkWidget *buttonbox,
@@ -109,6 +172,10 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (initialize_fio(envp))
 		return 1;
+
+	if (parse_options(argc, argv))
+		return 1;
+
 	init_ui(&argc, &argv, &ui);
 	gtk_main();
 	return 0;