projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 1.30
[fio.git]
/
parse.c
diff --git
a/parse.c
b/parse.c
index c2d744b3088f5a4d74f1e94e9ea9631f9b2859e4..5043374405d8a1e262687a5a1bdcac90f18990cf 100644
(file)
--- a/
parse.c
+++ b/
parse.c
@@
-46,7
+46,10
@@
static void show_option_range(struct fio_option *o)
if (!o->minval && !o->maxval)
return;
if (!o->minval && !o->maxval)
return;
- printf("%20s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+ printf("%20s: min=%d", "range", o->minval);
+ if (o->maxval)
+ printf(", max=%d", o->maxval);
+ printf("\n");
}
static void show_option_values(struct fio_option *o)
}
static void show_option_values(struct fio_option *o)
@@
-278,8
+281,7
@@
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
case FIO_OPT_STR_VAL_TIME:
is_time = 1;
case FIO_OPT_INT:
case FIO_OPT_STR_VAL_TIME:
is_time = 1;
case FIO_OPT_INT:
- case FIO_OPT_STR_VAL:
- case FIO_OPT_STR_VAL_INT: {
+ case FIO_OPT_STR_VAL: {
fio_opt_str_val_fn *fn = o->cb;
if (is_time)
fio_opt_str_val_fn *fn = o->cb;
if (is_time)
@@
-304,8
+306,7
@@
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
if (fn)
ret = fn(data, &ull);
else {
if (fn)
ret = fn(data, &ull);
else {
- if (o->type == FIO_OPT_STR_VAL_INT ||
- o->type == FIO_OPT_INT) {
+ if (o->type == FIO_OPT_INT) {
if (first)
val_store(ilp, ull, o->off1, data);
if (!more && o->off2)
if (first)
val_store(ilp, ull, o->off1, data);
if (!more && o->off2)
@@
-427,6
+428,12
@@
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
ret = 1;
}
ret = 1;
}
+ if (ret)
+ return ret;
+
+ if (o->verify)
+ ret = o->verify(o, data);
+
return ret;
}
return ret;
}
@@
-666,7
+673,6
@@
static void show_option_help(struct fio_option *o)
const char *typehelp[] = {
"string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
const char *typehelp[] = {
"string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
- "string with range and postfix (opt=1k-4k)",
"string with time postfix (opt=10s)",
"string (opt=bla)",
"string with dual range (opt=1k-4k,4k-8k)",
"string with time postfix (opt=10s)",
"string (opt=bla)",
"string with dual range (opt=1k-4k,4k-8k)",