GtkWidget *entry;
};
+#define GOPT_RANGE_SPIN 4
+
struct gopt_range {
struct gopt gopt;
- GtkWidget *spins[4];
+ GtkWidget *spins[GOPT_RANGE_SPIN];
};
-static struct gopt *gopt_new_str_store(struct fio_option *o)
+static struct gopt *gopt_new_str_store(struct fio_option *o, const char *text)
{
struct gopt_str *s;
GtkWidget *label;
gtk_box_pack_start(GTK_BOX(s->gopt.box), label, FALSE, FALSE, 0);
s->entry = gtk_entry_new();
+ if (text)
+ gtk_entry_set_text(GTK_ENTRY(s->entry), text);
gtk_entry_set_editable(GTK_ENTRY(s->entry), 1);
if (o->def)
return &s->gopt;
}
-static struct gopt *gopt_new_combo(struct fio_option *o)
+static struct gopt_combo *__gopt_new_combo(struct fio_option *o)
{
struct gopt_combo *combo;
- struct value_pair *vp;
GtkWidget *label;
- int i, active = 0;
combo = malloc(sizeof(*combo));
combo->combo = gtk_combo_box_new_text();
gtk_box_pack_start(GTK_BOX(combo->gopt.box), combo->combo, FALSE, FALSE, 0);
+ return combo;
+}
+
+static struct gopt *gopt_new_combo_str(struct fio_option *o, const char *text)
+{
+ struct gopt_combo *combo;
+ struct value_pair *vp;
+ int i, active = 0;
+
+ combo = __gopt_new_combo(o);
+
i = 0;
vp = &o->posval[0];
while (vp->ival) {
gtk_combo_box_append_text(GTK_COMBO_BOX(combo->combo), vp->ival);
if (o->def && !strcmp(vp->ival, o->def))
active = i;
+ if (text && !strcmp(vp->ival, text))
+ active = i;
vp++;
i++;
}
return &combo->gopt;
}
-static struct gopt *gopt_new_int(struct fio_option *o)
+static struct gopt *gopt_new_combo_int(struct fio_option *o, unsigned int *ip)
{
+ struct gopt_combo *combo;
+ struct value_pair *vp;
+ int i, active = 0;
+
+ combo = __gopt_new_combo(o);
+
+ i = 0;
+ vp = &o->posval[0];
+ while (vp->ival) {
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo->combo), vp->ival);
+ if (ip && vp->oval == *ip)
+ active = i;
+ vp++;
+ i++;
+ }
+
+ gtk_combo_box_set_active(GTK_COMBO_BOX(combo->combo), active);
+ return &combo->gopt;
+}
+
+static struct gopt *__gopt_new_int(struct fio_option *o, unsigned long long *p)
+{
+ unsigned long long defval;
struct gopt_int *i;
- gint maxval, defval;
+ guint maxval, interval;
GtkWidget *label;
i = malloc(sizeof(*i));
maxval = o->maxval;
if (!maxval)
- maxval = INT_MAX;
+ maxval = UINT_MAX;
defval = 0;
- if (o->def) {
+ if (p)
+ defval = *p;
+ else if (o->def) {
long long val;
check_str_bytes(o->def, &val, NULL);
defval = val;
}
- i->spin = gtk_spin_button_new_with_range(o->minval, maxval, 1.0);
+ interval = 1.0;
+ if (o->interval)
+ interval = o->interval;
+
+ i->spin = gtk_spin_button_new_with_range(o->minval, maxval, interval);
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);
return &i->gopt;
}
-static struct gopt *gopt_new_bool(struct fio_option *o)
+static struct gopt *gopt_new_int(struct fio_option *o, unsigned int *ip)
+{
+ unsigned long long ullp;
+
+ if (ip) {
+ ullp = *ip;
+ return __gopt_new_int(o, &ullp);
+ }
+
+ return __gopt_new_int(o, NULL);
+}
+
+static struct gopt *gopt_new_ullong(struct fio_option *o, unsigned long long *p)
+{
+ return __gopt_new_int(o, p);
+}
+
+static struct gopt *gopt_new_bool(struct fio_option *o, unsigned int *val)
{
struct gopt_bool *b;
GtkWidget *label;
gtk_box_pack_start(GTK_BOX(b->gopt.box), label, FALSE, FALSE, 0);
b->check = gtk_check_button_new();
- if (o->def && !strcmp(o->def, "1"))
+ if (val)
+ defstate = *val;
+ else if (o->def && !strcmp(o->def, "1"))
defstate = 1;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b->check), defstate);
return &b->gopt;
}
-static struct gopt *gopt_new_int_range(struct fio_option *o)
+/*
+ * These are paired 0/1 and 2/3. 0/2 are min values, 1/3 are max values.
+ * If the max is made smaller than min, adjust min down.
+ * If the min is made larger than max, adjust the max.
+ */
+static void range_value_changed(GtkSpinButton *spin, gpointer data)
+{
+ struct gopt_range *r = (struct gopt_range *) data;
+ int changed = -1, i;
+ gint val, mval;
+
+ for (i = 0; i < GOPT_RANGE_SPIN; i++) {
+ if (GTK_SPIN_BUTTON(r->spins[i]) == spin) {
+ changed = i;
+ break;
+ }
+ }
+
+ assert(changed != -1);
+
+ /*
+ * Min changed
+ */
+ if (changed == 0 || changed == 2) {
+ GtkWidget *mspin = r->spins[changed + 1];
+
+ val = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(r->spins[changed]));
+ mval = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(mspin));
+ if (val > mval)
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(mspin), val);
+ } else {
+ GtkWidget *mspin = r->spins[changed - 1];
+
+ val = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(r->spins[changed]));
+ mval = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(mspin));
+ if (val < mval)
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(mspin), val);
+ }
+}
+
+static struct gopt *gopt_new_int_range(struct fio_option *o, unsigned int **ip)
{
struct gopt_range *r;
gint maxval, defval;
GtkWidget *label;
+ guint interval;
int i;
r = malloc(sizeof(*r));
defval = val;
}
- for (i = 0; i < 4; i++) {
- r->spins[i] = gtk_spin_button_new_with_range(o->minval, maxval, 1.0);
+ interval = 1.0;
+ if (o->interval)
+ interval = o->interval;
+
+ 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);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(r->spins[i]), defval);
+ 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);
}
return &r->gopt;
}
static void gopt_add_option(GtkWidget *hbox, struct fio_option *o,
- unsigned int opt_index)
+ unsigned int opt_index, struct thread_options *to)
{
struct gopt *go = NULL;
switch (o->type) {
- case FIO_OPT_STR_STORE:
- go = gopt_new_str_store(o);
- break;
case FIO_OPT_STR_VAL:
- case FIO_OPT_STR_VAL_TIME:
- case FIO_OPT_INT:
- go = gopt_new_int(o);
+ case FIO_OPT_STR_VAL_TIME: {
+ unsigned long long *ullp = NULL;
+
+ if (o->off1)
+ ullp = td_var(to, o->off1);
+
+ go = gopt_new_ullong(o, ullp);
+ break;
+ }
+ case FIO_OPT_INT: {
+ unsigned int *ip = NULL;
+
+ if (o->off1)
+ ip = td_var(to, o->off1);
+
+ go = gopt_new_int(o, ip);
break;
+ }
case FIO_OPT_STR_SET:
- case FIO_OPT_BOOL:
- go = gopt_new_bool(o);
+ case FIO_OPT_BOOL: {
+ unsigned int *ip = NULL;
+
+ if (o->off1)
+ ip = td_var(to, o->off1);
+
+ go = gopt_new_bool(o, ip);
+ break;
+ }
+ case FIO_OPT_STR: {
+ unsigned int *ip = NULL;
+
+ if (o->off1)
+ ip = td_var(to, o->off1);
+
+ go = gopt_new_combo_int(o, ip);
break;
- case FIO_OPT_STR:
+ }
+ case FIO_OPT_STR_STORE: {
+ char *text = NULL;
+
+ if (o->off1) {
+ char **p = td_var(to, o->off1);
+ text = *p;
+ }
+
if (!o->posval[0].ival) {
- go = gopt_new_str_store(o);
+ go = gopt_new_str_store(o, text);
break;
}
+
+ go = gopt_new_combo_str(o, text);
+ break;
+ }
case FIO_OPT_STR_MULTI:
- go = gopt_new_combo(o);
+ go = gopt_new_combo_str(o, NULL);
break;
- case FIO_OPT_RANGE:
- go = gopt_new_int_range(o);
+ 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) };
+
+ go = gopt_new_int_range(o, ip);
break;
+ }
/* still need to handle this one */
case FIO_OPT_FLOAT_LIST:
break;
}
}
-static void gopt_add_options(GtkWidget **vboxes)
+static void gopt_add_options(GtkWidget **vboxes, struct thread_options *to)
{
GtkWidget *hbox = NULL;
int i;
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
- gopt_add_option(hbox, &fio_options[i], i);
+ gopt_add_option(hbox, o, i, to);
}
}
}
} while (1);
}
-void gopt_get_options_window(GtkWidget *window)
+void gopt_get_options_window(GtkWidget *window, struct thread_options *o)
{
GtkWidget *dialog, *notebook;
GtkWidget *vboxes[__FIO_OPT_G_NR];
gopt_add_group_tabs(notebook, vboxes);
- gopt_add_options(vboxes);
+ gopt_add_options(vboxes, o);
gtk_widget_show_all(dialog);
projects / fio.git / blobdiff