static void show_option_values(struct fio_option *o)
{
- int i = 0;
+ int i;
- do {
+ for (i = 0; i < PARSE_MAX_VP; i++) {
const struct value_pair *vp = &o->posval[i];
if (!vp->ival)
- break;
+ continue;
printf("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
if (vp->help)
printf(" %s", vp->help);
printf("\n");
- i++;
- } while (i < PARSE_MAX_VP);
+ }
if (i)
printf("\n");
return 1;
}
-static inline int o_match(struct fio_option *o, const char *opt)
-{
- if (!strcmp(o->name, opt))
- return 1;
- else if (o->alias && !strcmp(o->alias, opt))
- return 1;
-
- return 0;
-}
-
-static struct fio_option *find_option(struct fio_option *options,
- const char *opt)
-{
- struct fio_option *o;
-
- for (o = &options[0]; o->name; o++)
- if (o_match(o, opt))
- return o;
-
- return NULL;
-}
-
-#define val_store(ptr, val, off, data) \
+#define val_store(ptr, val, off, or, data) \
do { \
ptr = td_var((data), (off)); \
- *ptr = (val); \
+ if ((or)) \
+ *ptr |= (val); \
+ else \
+ *ptr = (val); \
} while (0)
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
}
switch (o->type) {
- case FIO_OPT_STR: {
+ case FIO_OPT_STR:
+ case FIO_OPT_STR_MULTI: {
fio_opt_str_fn *fn = o->cb;
const struct value_pair *vp;
struct value_pair posval[PARSE_MAX_VP];
posval_sort(o, posval);
+ ret = 1;
for (i = 0; i < PARSE_MAX_VP; i++) {
vp = &posval[i];
if (!vp->ival || vp->ival[0] == '\0')
- break;
- ret = 1;
+ continue;
if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
ret = 0;
- if (o->roff1)
- *(unsigned int *) o->roff1 = vp->oval;
- else {
+ if (o->roff1) {
+ if (vp->or)
+ *(unsigned int *) o->roff1 |= vp->oval;
+ else
+ *(unsigned int *) o->roff1 = vp->oval;
+ } else {
if (!o->off1)
- break;
- val_store(ilp, vp->oval, o->off1, data);
+ continue;
+ val_store(ilp, vp->oval, o->off1, vp->or, data);
}
- break;
+ continue;
}
}
if (o->roff1)
*(unsigned long long *) o->roff1 = ull;
else
- val_store(ilp, ull, o->off1, data);
+ val_store(ilp, ull, o->off1, 0, data);
}
if (!more) {
if (o->roff2)
*(unsigned long long *) o->roff2 = ull;
else if (o->off2)
- val_store(ilp, ull, o->off2, data);
+ val_store(ilp, ull, o->off2, 0, data);
}
} else {
if (first) {
if (o->roff1)
*(unsigned long long *) o->roff1 = ull;
else
- val_store(ullp, ull, o->off1, data);
+ val_store(ullp, ull, o->off1, 0, data);
}
if (!more) {
if (o->roff2)
*(unsigned long long *) o->roff2 = ull;
else if (o->off2)
- val_store(ullp, ull, o->off2, data);
+ val_store(ullp, ull, o->off2, 0, data);
}
}
}
if (o->roff1)
*(unsigned long *) o->roff1 = ul1;
else
- val_store(ilp, ul1, o->off1, data);
+ val_store(ilp, ul1, o->off1, 0, data);
if (o->roff2)
*(unsigned long *) o->roff2 = ul2;
else
- val_store(ilp, ul2, o->off2, data);
+ val_store(ilp, ul2, o->off2, 0, data);
}
if (o->roff3 && o->roff4) {
*(unsigned long *) o->roff3 = ul1;
*(unsigned long *) o->roff4 = ul2;
} else if (o->off3 && o->off4) {
- val_store(ilp, ul1, o->off3, data);
- val_store(ilp, ul2, o->off4, data);
+ val_store(ilp, ul1, o->off3, 0, data);
+ val_store(ilp, ul2, o->off4, 0, data);
}
}
if (o->roff1)
*(unsigned int *)o->roff1 = il;
else
- val_store(ilp, il, o->off1, data);
+ val_store(ilp, il, o->off1, 0, data);
}
if (!more) {
if (o->roff2)
*(unsigned int *) o->roff2 = il;
else if (o->off2)
- val_store(ilp, il, o->off2, data);
+ val_store(ilp, il, o->off2, 0, data);
}
}
break;
if (o->roff1)
*(unsigned int *) o->roff1 = 1;
else
- val_store(ilp, 1, o->off1, data);
+ val_store(ilp, 1, o->off1, 0, data);
}
if (!more) {
if (o->roff2)
*(unsigned int *) o->roff2 = 1;
else if (o->off2)
- val_store(ilp, 1, o->off2, data);
+ val_store(ilp, 1, o->off2, 0, data);
}
}
break;
ssize_t nchr = OPT_LEN_MAX;
size_t envlen;
- if (strlen(in) + 1 > OPT_LEN_MAX) {
+ if (strlen(opt) + 1 > OPT_LEN_MAX) {
fprintf(stderr, "OPT_LEN_MAX (%d) is too small\n", OPT_LEN_MAX);
return NULL;
}
fprintf(stderr, "Option %s: neither cb nor offset given\n",
o->name);
}
- if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE)
+ if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
+ o->type == FIO_OPT_STR_MULTI)
return;
if (o->cb && ((o->off1 || o->off2 || o->off3 || o->off4) ||
(o->roff1 || o->roff2 || o->roff3 || o->roff4))) {