X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=goptions.c;h=f44254bf38df5dcea4f0c5ca08f0bc3c3608d531;hp=87d92e696815bd00609ef7d8442eff9a97a49f54;hb=04ba61dfa67784d4dfcc22a2b3de7ede28e22e40;hpb=bb3d3c4d6cdb52f13353d0019b34de59596e5091

diff --git a/goptions.c b/goptions.c
index 87d92e69..f44254bf 100644
--- a/goptions.c
+++ b/goptions.c
@@ -1,5 +1,5 @@
 #include <locale.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
@@ -9,7 +9,9 @@
 #include "fio.h"
 #include "gfio.h"
 #include "ghelpers.h"
+#include "gerror.h"
 #include "parse.h"
+#include "optgroup.h"
 
 struct gopt {
 	GtkWidget *box;
@@ -27,7 +29,7 @@ struct gopt_combo {
 
 struct gopt_int {
 	struct gopt gopt;
-	unsigned int lastval;
+	unsigned long long lastval;
 	GtkWidget *spin;
 };
 
@@ -77,21 +79,24 @@ struct gopt_frame_widget {
 };
 
 struct gopt_job_view {
-	struct flist_head list;
 	struct gopt_frame_widget g_widgets[__FIO_OPT_G_NR];
-	GtkWidget *widgets[FIO_MAX_OPTS];
 	GtkWidget *vboxes[__FIO_OPT_C_NR];
+	struct gopt *gopts[FIO_MAX_OPTS];
+	GtkWidget *dialog;
+	GtkWidget *job_combo;
+	struct gfio_client *client;
 	struct flist_head changed_list;
 	struct thread_options *o;
+	int in_job_switch;
 };
 
 static GNode *gopt_dep_tree;
 
 static GtkWidget *gopt_get_group_frame(struct gopt_job_view *gjv,
-				       GtkWidget *box, unsigned int groupmask)
+				       GtkWidget *box, uint64_t groupmask)
 {
-	unsigned int mask, group;
-	struct opt_group *og;
+	uint64_t mask, group;
+	const struct opt_group *og;
 	GtkWidget *frame, *hbox;
 	struct gopt_frame_widget *gfw;
 
@@ -103,7 +108,7 @@ static GtkWidget *gopt_get_group_frame(struct gopt_job_view *gjv,
 	if (!og)
 		return NULL;
 
-	group = ffz(~groupmask);
+	group = ffz64(~groupmask);
 	gfw = &gjv->g_widgets[group];
 	if (!gfw->vbox[0]) {
 		frame = gtk_frame_new(og->name);
@@ -138,6 +143,7 @@ static void gopt_set_children_visible(struct gopt_job_view *gjv,
 	while (child) {
 		struct fio_option *o = child->data;
 		struct gopt *g = o->gui_data;
+		GtkWidget *widget = g->box;
 
 		/*
 		 * Recurse into child, if it also has children
@@ -145,9 +151,7 @@ static void gopt_set_children_visible(struct gopt_job_view *gjv,
 		if (g_node_n_children(child))
 			gopt_set_children_visible(gjv, o, visible);
 
-		if (gjv->widgets[g->opt_index])
-			gtk_widget_set_sensitive(gjv->widgets[g->opt_index], visible);
-
+		gtk_widget_set_sensitive(widget, visible);
 		child = g_node_next_sibling(child);
 	}
 }
@@ -156,25 +160,46 @@ static void gopt_mark_index(struct gopt_job_view *gjv, struct gopt *gopt,
 			    unsigned int idx, int type)
 {
 	INIT_FLIST_HEAD(&gopt->changed_list);
-	g_object_ref(G_OBJECT(gopt->box));
 
-	assert(!gjv->widgets[idx]);
+	assert(!gjv->gopts[idx]);
 	gopt->opt_index = idx;
 	gopt->opt_type = type;
 	gopt->gjv = gjv;
-	gjv->widgets[idx] = gopt->box;
+	gjv->gopts[idx] = gopt;
+}
+
+static void gopt_dialog_update_apply_button(struct gopt_job_view *gjv)
+{
+	GtkDialog *dialog = GTK_DIALOG(gjv->dialog);
+	gboolean set;
+
+	set = !flist_empty(&gjv->changed_list);
+	gtk_dialog_set_response_sensitive(dialog, GTK_RESPONSE_APPLY, set);
+
+	if (set) {
+		gtk_widget_set_sensitive(gjv->job_combo, 0);
+		gtk_widget_set_tooltip_text(gjv->job_combo, "Apply option changes before switching to a new job");
+	} else {
+		gtk_widget_set_sensitive(gjv->job_combo, 1);
+		gtk_widget_set_tooltip_text(gjv->job_combo, "Change current job");
+	}
 }
 
 static void gopt_changed(struct gopt *gopt)
 {
 	struct gopt_job_view *gjv = gopt->gjv;
 
+	if (gjv->in_job_switch)
+		return;
+
 	/*
 	 * Add to changed list. This also prevents the option from being
 	 * freed when the widget is destroyed.
 	 */
-	if (flist_empty(&gopt->changed_list))
+	if (flist_empty(&gopt->changed_list)) {
 		flist_add_tail(&gopt->changed_list, &gjv->changed_list);
+		gopt_dialog_update_apply_button(gjv);
+	}
 }
 
 static void gopt_str_changed(GtkEntry *entry, gpointer data)
@@ -200,6 +225,12 @@ static void gopt_str_destroy(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(w);
 }
 
+static void gopt_str_store_set_val(struct gopt_str *s, const char *text)
+{
+	if (text)
+		gtk_entry_set_text(GTK_ENTRY(s->entry), text);
+}
+
 static struct gopt *gopt_new_str_store(struct gopt_job_view *gjv,
 				       struct fio_option *o, const char *text,
 				       unsigned int idx)
@@ -217,12 +248,12 @@ static struct gopt *gopt_new_str_store(struct gopt_job_view *gjv,
 
 	s->entry = gtk_entry_new();
 	gopt_mark_index(gjv, &s->gopt, idx, GOPT_STR);
-	if (text)
-		gtk_entry_set_text(GTK_ENTRY(s->entry), text);
 	gtk_editable_set_editable(GTK_EDITABLE(s->entry), 1);
 
-	if (o->def)
-		gtk_entry_set_text(GTK_ENTRY(s->entry), o->def);
+	if (text)
+		gopt_str_store_set_val(s, text);
+	else if (o->def)
+		gopt_str_store_set_val(s, o->def);
 
 	s->gopt.sig_handler = g_signal_connect(G_OBJECT(s->entry), "changed", G_CALLBACK(gopt_str_changed), s);
 	g_signal_connect(G_OBJECT(s->entry), "destroy", G_CALLBACK(gopt_str_destroy), s);
@@ -278,6 +309,24 @@ static struct gopt_combo *__gopt_new_combo(struct gopt_job_view *gjv,
 	return c;
 }
 
+static void gopt_combo_str_set_val(struct gopt_combo *c, const char *text)
+{
+	struct fio_option *o = &fio_options[c->gopt.opt_index];
+	struct value_pair *vp;
+	int i;
+
+	i = 0;
+	vp = &o->posval[0];
+	while (vp->ival) {
+		if (!strcmp(vp->ival, text)) {
+			gtk_combo_box_set_active(GTK_COMBO_BOX(c->combo), i);
+			break;
+		}
+		vp++;
+		i++;
+	}
+}
+
 static struct gopt *gopt_new_combo_str(struct gopt_job_view *gjv,
 				       struct fio_option *o, const char *text,
 				       unsigned int idx)
@@ -294,17 +343,35 @@ static struct gopt *gopt_new_combo_str(struct gopt_job_view *gjv,
 		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(c->combo), vp->ival);
 		if (o->def && !strcmp(vp->ival, o->def))
 			active = i;
-		if (text && !strcmp(vp->ival, text))
-			active = i;
 		vp++;
 		i++;
 	}
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(c->combo), active);
+	if (text)
+		gopt_combo_str_set_val(c, text);
 	c->gopt.sig_handler = g_signal_connect(G_OBJECT(c->combo), "changed", G_CALLBACK(gopt_combo_changed), c);
 	return &c->gopt;
 }
 
+static void gopt_combo_int_set_val(struct gopt_combo *c, unsigned int ip)
+{
+	struct fio_option *o = &fio_options[c->gopt.opt_index];
+	struct value_pair *vp;
+	int i;
+
+	i = 0;
+	vp = &o->posval[0];
+	while (vp->ival) {
+		if (vp->oval == ip) {
+			gtk_combo_box_set_active(GTK_COMBO_BOX(c->combo), i);
+			break;
+		}
+		vp++;
+		i++;
+	}
+}
+
 static struct gopt *gopt_new_combo_int(struct gopt_job_view *gjv,
 				       struct fio_option *o, unsigned int *ip,
 				       unsigned int idx)
@@ -326,6 +393,8 @@ static struct gopt *gopt_new_combo_int(struct gopt_job_view *gjv,
 	}
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(c->combo), active);
+	if (ip)
+		gopt_combo_int_set_val(c, *ip);
 	c->gopt.sig_handler = g_signal_connect(G_OBJECT(c->combo), "changed", G_CALLBACK(gopt_combo_changed), c);
 	return &c->gopt;
 }
@@ -345,6 +414,10 @@ static void gopt_str_multi_destroy(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(w);
 }
 
+static void gopt_str_multi_set_val(struct gopt_str_multi *m, int val)
+{
+}
+
 static struct gopt *gopt_new_str_multi(struct gopt_job_view *gjv,
 				       struct fio_option *o, unsigned int idx)
 {
@@ -377,6 +450,7 @@ static struct gopt *gopt_new_str_multi(struct gopt_job_view *gjv,
 		i++;
 	}
 
+	gopt_str_multi_set_val(m, 0);
 	g_signal_connect(G_OBJECT(m->gopt.box), "destroy", G_CALLBACK(gopt_str_multi_destroy), m);
 	return &m->gopt;
 }
@@ -418,6 +492,12 @@ static void gopt_int_destroy(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(w);
 }
 
+static void gopt_int_set_val(struct gopt_int *i, unsigned long long p)
+{
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(i->spin), p);
+	i->lastval = p;
+}
+
 static struct gopt_int *__gopt_new_int(struct gopt_job_view *gjv,
 				       struct fio_option *o,
 				       unsigned long long *p, unsigned int idx)
@@ -444,7 +524,7 @@ static struct gopt_int *__gopt_new_int(struct gopt_job_view *gjv,
 	else if (o->def) {
 		long long val;
 
-		check_str_bytes(o->def, &val, NULL);
+		check_str_bytes(o->def, &val, o);
 		defval = val;
 	}
 
@@ -455,8 +535,10 @@ static struct gopt_int *__gopt_new_int(struct gopt_job_view *gjv,
 	i->spin = gtk_spin_button_new_with_range(o->minval, maxval, interval);
 	gopt_mark_index(gjv, &i->gopt, idx, GOPT_INT);
 	gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(i->spin), GTK_UPDATE_IF_VALID);
-	gtk_spin_button_set_value(GTK_SPIN_BUTTON(i->spin), defval);
-	i->lastval = defval;
+	if (p)
+		gopt_int_set_val(i, *p);
+	else
+		gopt_int_set_val(i, defval);
 	i->gopt.sig_handler = g_signal_connect(G_OBJECT(i->spin), "value-changed", G_CALLBACK(gopt_int_changed), i);
 	g_signal_connect(G_OBJECT(i->spin), "destroy", G_CALLBACK(gopt_int_destroy), i);
 
@@ -524,6 +606,11 @@ static void gopt_bool_destroy(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(w);
 }
 
+static void gopt_bool_set_val(struct gopt_bool *b, unsigned int val)
+{
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b->check), val);
+}
+
 static struct gopt *gopt_new_bool(struct gopt_job_view *gjv,
 				  struct fio_option *o, unsigned int *val,
 				  unsigned int idx)
@@ -541,15 +628,16 @@ static struct gopt *gopt_new_bool(struct gopt_job_view *gjv,
 
 	b->check = gtk_check_button_new();
 	gopt_mark_index(gjv, &b->gopt, idx, GOPT_BOOL);
-	if (val)
-		defstate = *val;
-	else if (o->def && !strcmp(o->def, "1"))
+	if (o->def && !strcmp(o->def, "1"))
 		defstate = 1;
 
 	if (o->neg)
 		defstate = !defstate;
 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b->check), defstate);
+	if (val)
+		gopt_bool_set_val(b, *val);
+	else
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b->check), defstate);
 	b->gopt.sig_handler = g_signal_connect(G_OBJECT(b->check), "toggled", G_CALLBACK(gopt_bool_toggled), b);
 	g_signal_connect(G_OBJECT(b->check), "destroy", G_CALLBACK(gopt_bool_destroy), b);
 
@@ -608,14 +696,23 @@ static void gopt_range_destroy(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(w);
 }
 
+static void gopt_int_range_set_val(struct gopt_range *r, unsigned int *vals)
+{
+	int i;
+
+	for (i = 0; i < GOPT_RANGE_SPIN; i++)
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(r->spins[i]), vals[i]);
+}
+
 static struct gopt *gopt_new_int_range(struct gopt_job_view *gjv,
 				       struct fio_option *o, unsigned int **ip,
 				       unsigned int idx)
 {
 	struct gopt_range *r;
-	gint maxval, defval;
 	GtkWidget *label;
 	guint interval;
+	unsigned int defvals[GOPT_RANGE_SPIN];
+	gint maxval;
 	int i;
 
 	r = calloc(1, sizeof(*r));
@@ -630,12 +727,13 @@ static struct gopt *gopt_new_int_range(struct gopt_job_view *gjv,
 	if (!maxval)
 		maxval = INT_MAX;
 
-	defval = 0;
+	memset(defvals, 0, sizeof(defvals));
 	if (o->def) {
 		long long val;
 
-		check_str_bytes(o->def, &val, NULL);
-		defval = val;
+		check_str_bytes(o->def, &val, o);
+		for (i = 0; i < GOPT_RANGE_SPIN; i++)
+			defvals[i] = val;
 	}
 
 	interval = 1.0;
@@ -645,15 +743,17 @@ static struct gopt *gopt_new_int_range(struct gopt_job_view *gjv,
 	for (i = 0; i < GOPT_RANGE_SPIN; i++) {
 		r->spins[i] = gtk_spin_button_new_with_range(o->minval, maxval, interval);
 		gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(r->spins[i]), GTK_UPDATE_IF_VALID);
-		if (ip)
-			gtk_spin_button_set_value(GTK_SPIN_BUTTON(r->spins[i]), *ip[i]);
-		else
-			gtk_spin_button_set_value(GTK_SPIN_BUTTON(r->spins[i]), defval);
-
 		gtk_box_pack_start(GTK_BOX(r->gopt.box), r->spins[i], FALSE, FALSE, 0);
-		g_signal_connect(G_OBJECT(r->spins[i]), "value-changed", G_CALLBACK(range_value_changed), r);
 	}
 
+	if (ip)
+		gopt_int_range_set_val(r, *ip);
+	else
+		gopt_int_range_set_val(r, defvals);
+
+	for (i = 0; i < GOPT_RANGE_SPIN; i++)
+		g_signal_connect(G_OBJECT(r->spins[i]), "value-changed", G_CALLBACK(range_value_changed), r);
+
 	gtk_box_pack_start(GTK_BOX(r->gopt.box), label, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(r->gopt.box), "destroy", G_CALLBACK(gopt_range_destroy), r);
 	return &r->gopt;
@@ -705,13 +805,28 @@ static void gopt_str_val_changed(GtkSpinButton *spin, gpointer data)
 	gopt_changed(&g->gopt);
 }
 
+static void gopt_str_val_set_val(struct gopt_str_val *g, unsigned long long val)
+{
+	int i = 0;
+
+	do {
+		if (!val || (val % 1024))
+			break;
+
+		i++;
+		val /= 1024;
+	} while (1);
+
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(g->spin), val);
+	gtk_combo_box_set_active(GTK_COMBO_BOX(g->combo), i);
+}
+
 static struct gopt *gopt_new_str_val(struct gopt_job_view *gjv,
 				     struct fio_option *o,
 				     unsigned long long *p, unsigned int idx)
 {
 	struct gopt_str_val *g;
-	const gchar *postfix[] = { "B", "KB", "MB", "GB", "PB", "TB", "" };
-	unsigned long long val;
+	const gchar *postfix[] = { "B", "KiB", "MiB", "GiB", "PiB", "PiB", "" };
 	GtkWidget *label;
 	int i;
 
@@ -742,23 +857,8 @@ static struct gopt *gopt_new_str_val(struct gopt_job_view *gjv,
 	gtk_box_pack_start(GTK_BOX(g->gopt.box), g->combo, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(g->gopt.box), label, FALSE, FALSE, 3);
 
-	/*
-	 * Set the value
-	 */
-	if (p) {
-		val = *p;
-		i = 0;
-		do {
-			if (!val || (val % 1024))
-				break;
-
-			i++;
-			val /= 1024;
-		} while (1);
-
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(g->spin), val);
-		gtk_combo_box_set_active(GTK_COMBO_BOX(g->combo), i);
-	}
+	if (p)
+		gopt_str_val_set_val(g, *p);
 
 	g_signal_connect(G_OBJECT(g->combo), "changed", G_CALLBACK(gopt_str_val_changed), g);
 
@@ -766,6 +866,144 @@ static struct gopt *gopt_new_str_val(struct gopt_job_view *gjv,
 	return &g->gopt;
 }
 
+static void gopt_set_option(struct gopt_job_view *gjv, struct fio_option *o,
+			    struct gopt *gopt, struct thread_options *to)
+{
+	switch (o->type) {
+	case FIO_OPT_STR_VAL: {
+		unsigned long long *ullp = NULL;
+		struct gopt_str_val *g;
+
+		if (o->off1)
+			ullp = td_var(to, o, o->off1);
+
+		g = container_of(gopt, struct gopt_str_val, gopt);
+		if (ullp)
+			gopt_str_val_set_val(g, *ullp);
+		break;
+		}
+	case FIO_OPT_STR_VAL_TIME: {
+		unsigned long long *ullp = NULL;
+		struct gopt_int *i;
+
+		if (o->off1)
+			ullp = td_var(to, o, o->off1);
+
+		i = container_of(gopt, struct gopt_int, gopt);
+		if (ullp)
+			gopt_int_set_val(i, *ullp);
+		break;
+		}
+	case FIO_OPT_INT:
+		if (o->posval[0].ival) {
+			unsigned int *ip = NULL;
+			struct gopt_combo *c;
+
+			if (o->off1)
+				ip = td_var(to, o, o->off1);
+
+			c = container_of(gopt, struct gopt_combo, gopt);
+			if (ip)
+				gopt_combo_int_set_val(c, *ip);
+		} else {
+			unsigned int *ip = NULL;
+			struct gopt_int *i;
+
+			if (o->off1)
+				ip = td_var(to, o, o->off1);
+
+			i = container_of(gopt, struct gopt_int, gopt);
+			if (ip)
+				gopt_int_set_val(i, *ip);
+		}
+		break;
+	case FIO_OPT_STR_SET:
+	case FIO_OPT_BOOL: {
+		unsigned int *ip = NULL;
+		struct gopt_bool *b;
+
+		if (o->off1)
+			ip = td_var(to, o, o->off1);
+
+		b = container_of(gopt, struct gopt_bool, gopt);
+		if (ip)
+			gopt_bool_set_val(b, *ip);
+		break;
+		}
+	case FIO_OPT_STR: {
+		if (o->posval[0].ival) {
+			unsigned int *ip = NULL;
+			struct gopt_combo *c;
+
+			if (o->off1)
+				ip = td_var(to, o, o->off1);
+
+			c = container_of(gopt, struct gopt_combo, gopt);
+			if (ip)
+				gopt_combo_int_set_val(c, *ip);
+		} else {
+			struct gopt_str *s;
+			char *text = NULL;
+
+			if (o->off1) {
+				char **p = td_var(to, o, o->off1);
+
+				text = *p;
+			}
+
+			s = container_of(gopt, struct gopt_str, gopt);
+			gopt_str_store_set_val(s, text);
+		}
+
+		break;
+		}
+	case FIO_OPT_STR_STORE: {
+		struct gopt_combo *c;
+		char *text = NULL;
+
+		if (o->off1) {
+			char **p = td_var(to, o, o->off1);
+			text = *p;
+		}
+
+		if (!o->posval[0].ival) {
+			struct gopt_str *s;
+
+			s = container_of(gopt, struct gopt_str, gopt);
+			gopt_str_store_set_val(s, text);
+			break;
+		}
+
+		c = container_of(gopt, struct gopt_combo, gopt);
+		if (text)
+			gopt_combo_str_set_val(c, text);
+		break;
+		}
+	case FIO_OPT_STR_MULTI:
+		/* HANDLE ME */
+		break;
+	case FIO_OPT_RANGE: {
+		struct gopt_range *r;
+		unsigned int *ip[4] = { td_var(to, o, o->off1),
+					td_var(to, o, o->off2),
+					td_var(to, o, o->off3),
+					td_var(to, o, o->off4) };
+
+		r = container_of(gopt, struct gopt_range, gopt);
+		gopt_int_range_set_val(r, *ip);
+		break;
+		}
+	/* still need to handle this one */
+	case FIO_OPT_FLOAT_LIST:
+		break;
+	case FIO_OPT_DEPRECATED:
+		break;
+	default:
+		printf("ignore type %u\n", o->type);
+		break;
+	}
+}
+
 static void gopt_add_option(struct gopt_job_view *gjv, GtkWidget *hbox,
 			    struct fio_option *o, unsigned int opt_index,
 			    struct thread_options *to)
@@ -777,7 +1015,7 @@ static void gopt_add_option(struct gopt_job_view *gjv, GtkWidget *hbox,
 		unsigned long long *ullp = NULL;
 
 		if (o->off1)
-			ullp = td_var(to, o->off1);
+			ullp = td_var(to, o, o->off1);
 
 		go = gopt_new_str_val(gjv, o, ullp, opt_index);
 		break;
@@ -786,26 +1024,34 @@ static void gopt_add_option(struct gopt_job_view *gjv, GtkWidget *hbox,
 		unsigned long long *ullp = NULL;
 
 		if (o->off1)
-			ullp = td_var(to, o->off1);
+			ullp = td_var(to, o, o->off1);
 
 		go = gopt_new_ullong(gjv, o, ullp, opt_index);
 		break;
 		}
-	case FIO_OPT_INT: {
-		unsigned int *ip = NULL;
+	case FIO_OPT_INT:
+		if (o->posval[0].ival) {
+			unsigned int *ip = NULL;
 
-		if (o->off1)
-			ip = td_var(to, o->off1);
+			if (o->off1)
+				ip = td_var(to, o, o->off1);
 
-		go = gopt_new_int(gjv, o, ip, opt_index);
-		break;
+			go = gopt_new_combo_int(gjv, o, ip, opt_index);
+		} else {
+			unsigned int *ip = NULL;
+
+			if (o->off1)
+				ip = td_var(to, o, o->off1);
+
+			go = gopt_new_int(gjv, o, ip, opt_index);
 		}
+		break;
 	case FIO_OPT_STR_SET:
 	case FIO_OPT_BOOL: {
 		unsigned int *ip = NULL;
 
 		if (o->off1)
-			ip = td_var(to, o->off1);
+			ip = td_var(to, o, o->off1);
 
 		go = gopt_new_bool(gjv, o, ip, opt_index);
 		break;
@@ -815,7 +1061,7 @@ static void gopt_add_option(struct gopt_job_view *gjv, GtkWidget *hbox,
 			unsigned int *ip = NULL;
 
 			if (o->off1)
-				ip = td_var(to, o->off1);
+				ip = td_var(to, o, o->off1);
 
 			go = gopt_new_combo_int(gjv, o, ip, opt_index);
 		} else {
@@ -829,7 +1075,7 @@ static void gopt_add_option(struct gopt_job_view *gjv, GtkWidget *hbox,
 		char *text = NULL;
 
 		if (o->off1) {
-			char **p = td_var(to, o->off1);
+			char **p = td_var(to, o, o->off1);
 			text = *p;
 		}
 
@@ -845,10 +1091,10 @@ static void gopt_add_option(struct gopt_job_view *gjv, GtkWidget *hbox,
 		go = gopt_new_str_multi(gjv, o, opt_index);
 		break;
 	case FIO_OPT_RANGE: {
-		unsigned int *ip[4] = { td_var(to, o->off1),
-					td_var(to, o->off2),
-					td_var(to, o->off3),
-					td_var(to, o->off4) };
+		unsigned int *ip[4] = { td_var(to, o, o->off1),
+					td_var(to, o, o->off2),
+					td_var(to, o, o->off3),
+					td_var(to, o, o->off4) };
 
 		go = gopt_new_int_range(gjv, o, ip, opt_index);
 		break;
@@ -890,11 +1136,11 @@ static void gopt_add_options(struct gopt_job_view *gjv,
 	 */
 	for (i = 0; fio_options[i].name; i++) {
 		struct fio_option *o = &fio_options[i];
-		unsigned int mask = o->category;
-		struct opt_group *og;
+		uint64_t mask = o->category;
+		const struct opt_group *og;
 
 		while ((og = opt_group_from_mask(&mask)) != NULL) {
-			GtkWidget *vbox = gjv->vboxes[ffz(~og->mask)];
+			GtkWidget *vbox = gjv->vboxes[ffz64(~og->mask)];
 
 			hbox = gtk_hbox_new(FALSE, 3);
 			gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
@@ -903,6 +1149,19 @@ static void gopt_add_options(struct gopt_job_view *gjv,
 	}
 }
 
+static void gopt_set_options(struct gopt_job_view *gjv,
+			     struct thread_options *to)
+{
+	int i;
+
+	for (i = 0; fio_options[i].name; i++) {
+		struct fio_option *o = &fio_options[i];
+		struct gopt *gopt = gjv->gopts[i];
+
+		gopt_set_option(gjv, o, gopt, to);
+	}
+}
+
 static GtkWidget *gopt_add_tab(GtkWidget *notebook, const char *name)
 {
 	GtkWidget *box, *vbox, *scroll;
@@ -919,19 +1178,20 @@ static GtkWidget *gopt_add_tab(GtkWidget *notebook, const char *name)
 	return vbox;
 }
 
-static GtkWidget *gopt_add_group_tab(GtkWidget *notebook, struct opt_group *og)
+static GtkWidget *gopt_add_group_tab(GtkWidget *notebook,
+				     const struct opt_group *og)
 {
 	return gopt_add_tab(notebook, og->name);
 }
 
 static void gopt_add_group_tabs(GtkWidget *notebook, struct gopt_job_view *gjv)
 {
-	struct opt_group *og;
+	const struct opt_group *og;
 	unsigned int i;
 
 	i = 0;
 	do {
-		unsigned int mask = (1U << i);
+		uint64_t mask = (1ULL << i);
 
 		og = opt_group_from_mask(&mask);
 		if (!og)
@@ -945,7 +1205,7 @@ static void gopt_handle_str_multi_changed(struct gopt_job_view *gjv,
 					  struct gopt_str_multi *m,
 					  struct fio_option *o)
 {
-	unsigned int *ip = td_var(gjv->o, o->off1);
+	unsigned int *ip = td_var(gjv->o, o, o->off1);
 	struct value_pair *vp;
 	gboolean set;
 	guint val = 0;
@@ -958,7 +1218,7 @@ static void gopt_handle_str_multi_changed(struct gopt_job_view *gjv,
 			break;
 		set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m->checks[i]));
 		if (set) {
-			if (vp->or)
+			if (vp->orval)
 				val |= vp->oval;
 			else
 				val = vp->oval;
@@ -975,10 +1235,10 @@ static void gopt_handle_range_changed(struct gopt_job_view *gjv,
 				      struct gopt_range *r,
 				      struct fio_option *o)
 {
-	unsigned int *ip[4] = { td_var(gjv->o, o->off1),
-				td_var(gjv->o, o->off2),
-				td_var(gjv->o, o->off3),
-				td_var(gjv->o, o->off4) };
+	unsigned int *ip[4] = { td_var(gjv->o, o, o->off1),
+				td_var(gjv->o, o, o->off2),
+				td_var(gjv->o, o, o->off3),
+				td_var(gjv->o, o, o->off4) };
 	gint val;
 	int i;
 
@@ -992,7 +1252,7 @@ static void gopt_handle_str_val_changed(struct gopt_job_view *gjv,
 					struct gopt_str_val *s,
 					struct fio_option *o)
 {
-	unsigned long long *ullp = td_var(gjv->o, o->off1);
+	unsigned long long *ullp = td_var(gjv->o, o, o->off1);
 	GtkAdjustment *adj;
 	gint index;
 
@@ -1016,7 +1276,7 @@ static void gopt_handle_str_val_changed(struct gopt_job_view *gjv,
 static void gopt_handle_str_changed(struct gopt_job_view *gjv,
 				    struct gopt_str *s, struct fio_option *o)
 {
-	char **p = td_var(gjv->o, o->off1);
+	char **p = td_var(gjv->o, o, o->off1);
 
 	if (*p)
 		free(*p);
@@ -1027,7 +1287,7 @@ static void gopt_handle_str_changed(struct gopt_job_view *gjv,
 static void gopt_handle_bool_changed(struct gopt_job_view *gjv,
 				     struct gopt_bool *b, struct fio_option *o)
 {
-	unsigned int *ip = td_var(gjv->o, o->off1);
+	unsigned int *ip = td_var(gjv->o, o, o->off1);
 	gboolean set;
 
 	set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b->check));
@@ -1037,7 +1297,7 @@ static void gopt_handle_bool_changed(struct gopt_job_view *gjv,
 static void gopt_handle_int_changed(struct gopt_job_view *gjv,
 				    struct gopt_int *i, struct fio_option *o)
 {
-	unsigned int *ip = td_var(gjv->o, o->off1);
+	unsigned int *ip = td_var(gjv->o, o, o->off1);
 	GtkAdjustment *adj;
 	guint val;
 
@@ -1050,7 +1310,7 @@ static void gopt_handle_combo_str_changed(struct gopt_job_view *gjv,
 					  struct gopt_combo *c,
 					  struct fio_option *o)
 {
-	char **p = td_var(gjv->o, o->off1);
+	char **p = td_var(gjv->o, o, o->off1);
 
 	if (*p)
 		free(*p);
@@ -1062,7 +1322,7 @@ static void gopt_handle_combo_int_changed(struct gopt_job_view *gjv,
 					  struct gopt_combo *c,
 					  struct fio_option *o)
 {
-	unsigned int *ip = td_var(gjv->o, o->off1);
+	unsigned int *ip = td_var(gjv->o, o, o->off1);
 	gint index;
 
 	index = gtk_combo_box_get_active(GTK_COMBO_BOX(c->combo));
@@ -1132,54 +1392,166 @@ static void gopt_handle_changed(struct gopt *gopt)
 		break;
 		}
 	default:
-		log_err("gfio: bad option type %s/%d\n", gopt->opt_type);
-		return;
+		log_err("gfio: bad option type: %d\n", gopt->opt_type);
+		break;
 	}
+}
+
+static void gopt_report_update_status(struct gopt_job_view *gjv)
+{
+	struct gfio_client *gc = gjv->client;
+	char tmp[80];
 
-	g_object_unref(G_OBJECT(gopt->box));
+	sprintf(tmp, "\nCompleted with error: %d\n", gc->update_job_status);
+	gfio_report_info(gc->ge->ui, "Update job", tmp);
 }
 
-static void gopt_handle_changed_options(struct gopt_job_view *gjv)
+static int gopt_handle_changed_options(struct gopt_job_view *gjv)
 {
+	struct gfio_client *gc = gjv->client;
+	struct flist_head *entry;
+	uint64_t waitid = 0;
 	struct gopt *gopt;
+	int ret;
 
-	while (!flist_empty(&gjv->changed_list)) {
-		gopt = flist_entry(gjv->changed_list.next, struct gopt, changed_list);
-		flist_del(&gopt->changed_list);
+	flist_for_each(entry, &gjv->changed_list) {
+		gopt = flist_entry(entry, struct gopt, changed_list);
 		gopt_handle_changed(gopt);
 	}
+
+	gc->update_job_status = 0;
+	gc->update_job_done = 0;
+
+	ret = fio_client_update_options(gc->client, gjv->o, &waitid);
+	if (ret)
+		goto done;
+
+	ret = fio_client_wait_for_reply(gc->client, waitid);
+	if (ret)
+		goto done;
+
+	assert(gc->update_job_done);
+	if (gc->update_job_status)
+		goto done;
+
+	while (!flist_empty(&gjv->changed_list)) {
+		gopt = flist_first_entry(&gjv->changed_list, struct gopt, changed_list);
+		flist_del_init(&gopt->changed_list);
+	}
+
+done:
+	gopt_dialog_update_apply_button(gjv);
+	return ret;
 }
 
-void gopt_get_options_window(GtkWidget *window, struct gfio_client *gc)
+static gint gopt_dialog_cancel(gint response)
 {
-	GtkWidget *dialog, *notebook, *topnotebook, *vbox;
-	struct gfio_client_options *gco;
-	struct thread_options *o;
+	switch (response) {
+	case GTK_RESPONSE_NONE:
+	case GTK_RESPONSE_REJECT:
+	case GTK_RESPONSE_DELETE_EVENT:
+	case GTK_RESPONSE_CANCEL:
+	case GTK_RESPONSE_NO:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+static gint gopt_dialog_done(gint response)
+{
+	switch (response) {
+	case GTK_RESPONSE_ACCEPT:
+	case GTK_RESPONSE_OK:
+	case GTK_RESPONSE_YES:
+		return 1;
+	default:
+		return 0;
+	}
+}
+
+static void gopt_handle_option_dialog(struct gopt_job_view *gjv)
+{
+	gint response;
+
+	do {
+		response = gtk_dialog_run(GTK_DIALOG(gjv->dialog));
+
+		if (gopt_dialog_cancel(response) ||
+		    gopt_dialog_done(response))
+			break;
+
+		/*
+		 * Apply
+		 */
+		gopt_handle_changed_options(gjv);
+		gopt_report_update_status(gjv);
+	} while (1);
+
+	if (gopt_dialog_cancel(response))
+		return;
+
+	gopt_handle_changed_options(gjv);
+}
+
+static void gopt_job_changed(GtkComboBox *box, gpointer data)
+{
+	struct gopt_job_view *gjv = (struct gopt_job_view *) data;
+	struct gfio_client_options *gco = NULL;
+	struct gfio_client *gc = gjv->client;
 	struct flist_head *entry;
-	struct gopt_job_view *gjv;
-	FLIST_HEAD(gjv_list);
+	gchar *job;
 
 	/*
-	 * Just choose the first item, we need to make each options
-	 * entry the main notebook, with the below options view as
-	 * a sub-notebook
+	 * The switch act should be sensitized appropriately, so that we
+	 * never get here with modified options.
 	 */
-	assert(!flist_empty(&gc->o_list));
+	if (!flist_empty(&gjv->changed_list)) {
+		gfio_report_info(gc->ge->ui, "Internal Error", "Modified options on job switch.\nThat should not be possible!\n");
+		return;
+	}
+
+	job = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(gjv->job_combo));
+	flist_for_each(entry, &gc->o_list) {
+		const char *name;
+
+		gco = flist_entry(entry, struct gfio_client_options, list);
+		name = gco->o.name;
+		if (!name || !strlen(name))
+			name = "Default job";
+
+		if (!strcmp(name, job))
+			break;
+
+		gco = NULL;
+	}
+
+	if (!gco) {
+		gfio_report_info(gc->ge->ui, "Internal Error", "Could not find job description.\nThat should not be possible!\n");
+		return;
+	}
+
+	gjv->in_job_switch = 1;
+	gopt_set_options(gjv, &gco->o);
+	gjv->in_job_switch = 0;
+}
+
+void gopt_get_options_window(GtkWidget *window, struct gfio_client *gc)
+{
+	GtkWidget *dialog, *notebook, *vbox, *topvbox, *combo;
+	struct gfio_client_options *gco;
+	struct flist_head *entry;
+	struct gopt_job_view *gjv;
 
 	dialog = gtk_dialog_new_with_buttons("Fio options",
 			GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT,
 			GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+			GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
 			GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
 
-	gtk_widget_set_size_request(GTK_WIDGET(dialog), 1024, 768);
-
-	topnotebook = gtk_notebook_new();
-	gtk_notebook_set_scrollable(GTK_NOTEBOOK(topnotebook), 1);
-	gtk_notebook_popup_enable(GTK_NOTEBOOK(topnotebook));
-	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-	gtk_box_pack_start(GTK_BOX(vbox), topnotebook, TRUE, TRUE, 5);
-
+	combo = gtk_combo_box_text_new();
 	flist_for_each(entry, &gc->o_list) {
+		struct thread_options *o;
 		const char *name;
 
 		gco = flist_entry(entry, struct gfio_client_options, list);
@@ -1188,36 +1560,42 @@ void gopt_get_options_window(GtkWidget *window, struct gfio_client *gc)
 		if (!name || !strlen(name))
 			name = "Default job";
 
-		vbox = gopt_add_tab(topnotebook, name);
+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), name);
+	}
+	gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 
-		notebook = gtk_notebook_new();
-		gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), 1);
-		gtk_notebook_popup_enable(GTK_NOTEBOOK(notebook));
-		gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 5);
+	gtk_widget_set_size_request(GTK_WIDGET(dialog), 1024, 768);
 
-		gjv = calloc(1, sizeof(*gjv));
-		INIT_FLIST_HEAD(&gjv->list);
-		INIT_FLIST_HEAD(&gjv->changed_list);
-		gjv->o = o;
-		flist_add_tail(&gjv->list, &gjv_list);
-		gopt_add_group_tabs(notebook, gjv);
-		gopt_add_options(gjv, o);
-	}
+	topvbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+	gtk_box_pack_start(GTK_BOX(topvbox), combo, FALSE, FALSE, 5);
 
-	gtk_widget_show_all(dialog);
+	vbox = gtk_vbox_new(TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(topvbox), vbox, TRUE, TRUE, 5);
 
-	gtk_dialog_run(GTK_DIALOG(dialog));
+	notebook = gtk_notebook_new();
+	gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), 1);
+	gtk_notebook_popup_enable(GTK_NOTEBOOK(notebook));
+	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 5);
 
-	while (!flist_empty(&gjv_list)) {
-		gjv = flist_entry(gjv_list.next, struct gopt_job_view, list);
+	gjv = calloc(1, sizeof(*gjv));
+	INIT_FLIST_HEAD(&gjv->changed_list);
+	gco = flist_first_entry(&gc->o_list, struct gfio_client_options, list);
+	gjv->o = &gco->o;
+	gjv->dialog = dialog;
+	gjv->client = gc;
+	gjv->job_combo = combo;
+	gopt_add_group_tabs(notebook, gjv);
+	gopt_add_options(gjv, &gco->o);
+	gopt_dialog_update_apply_button(gjv);
 
-		gopt_handle_changed_options(gjv);
+	g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(gopt_job_changed), gjv);
 
-		flist_del(&gjv->list);
-		free(gjv);
-	}
+	gtk_widget_show_all(dialog);
+
+	gopt_handle_option_dialog(gjv);
 
 	gtk_widget_destroy(dialog);
+	free(gjv);
 }
 
 /*