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;
static struct fio_option *find_option(struct fio_option *options,
const char *opt)
{
- struct fio_option *o = &options[0];
+ struct fio_option *o;
- while (o->name) {
+ for (o = &options[0]; o->name; o++) {
if (!strcmp(o->name, opt))
return o;
-
- o++;
+ else if (o->alias && !strcmp(o->alias, opt))
+ return o;
}
return NULL;
p1 = strchr(tmp, '-');
if (!p1) {
- ret = 1;
- break;
+ p1 = strchr(tmp, ':');
+ if (!p1) {
+ ret = 1;
+ break;
+ }
}
p2 = p1 + 1;
return 1;
}
+ if (o->neg)
+ il = !il;
+
if (fn)
ret = fn(data, &il);
else {
* 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
int show_cmd_help(struct fio_option *options, const char *name)
{
int show_all = !strcmp(name, "all");
- struct fio_option *o = &options[0];
const char *typehelp[] = {
"string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
"boolean value (opt=1)",
"no argument (opt)",
};
+ struct fio_option *o;
int found = 0;
- while (o->name) {
+ for (o = &options[0]; o->name; o++) {
int match = !strcmp(name, o->name);
if (show_all || match) {
found = 1;
printf("%16s: %s\n", o->name, o->help);
- if (match) {
- printf("%16s: %s\n", "type", typehelp[o->type]);
- printf("%16s: %s\n", "default", o->def ? o->def : "no default");
- show_option_range(o);
- show_option_values(o);
- }
+ if (show_all)
+ continue;
}
- o++;
+ 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);
+ show_option_values(o);
}
if (found)
*/
void fill_default_options(void *data, struct fio_option *options)
{
- struct fio_option *o = &options[0];
+ struct fio_option *o;
- while (o->name) {
+ for (o = &options[0]; o->name; o++)
if (o->def)
handle_option(o, o->def, data);
- 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)
{
- struct fio_option *o = &options[0];
+ struct fio_option *o;
- while (o->name) {
+ for (o = &options[0]; o->name; o++) {
if (o->type == FIO_OPT_BOOL) {
o->minval = 0;
o->maxval = 1;
}
- o++;
+ if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
+ fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
}
}