case 'g':
case 'G':
return 1024 * 1024 * 1024;
+ case 'e':
+ case 'E':
+ return 1024 * 1024 * 1024 * 1024UL;
default:
return 1;
}
if (!len)
return 1;
- *val = strtol(str, NULL, 10);
+ *val = strtoll(str, NULL, 10);
if (*val == LONG_MAX && errno == ERANGE)
return 1;
p1 = strchr(tmp, '-');
if (!p1) {
- ret = 1;
- break;
+ p1 = strchr(tmp, ':');
+ if (!p1) {
+ ret = 1;
+ break;
+ }
}
p2 = p1 + 1;
* Do this before parsing the first round, to check if we should
* copy set 1 options to set 2.
*/
- if (ptr)
+ if (ptr && (o->type != FIO_OPT_STR_STORE)) {
ptr2 = strchr(ptr, ',');
+ if (!ptr2)
+ ptr2 = strchr(ptr, ':');
+ }
/*
* Don't return early if parsing the first option fails - if
continue;
}
+ if (!match)
+ continue;
+
printf("%16s: %s\n", "type", typehelp[o->type]);
printf("%16s: %s\n", "default", o->def ? o->def : "no default");
show_option_range(o);
/*
* Sanitize the options structure. For now it just sets min/max for bool
- * values.
+ * values and whether both callback and offsets are given.
*/
void options_init(struct fio_option *options)
{
o->minval = 0;
o->maxval = 1;
}
+ if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
+ fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
}
}