parse: bring in more stuff from gfio

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index dddcb8e51cc007634c60050de0a812f7518ca8c1..bd323ca84624351aa37390c5090c236f6a624511 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -50,7 +50,7 @@ static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
 static void show_option_range(struct fio_option *o,
                                int (*logger)(const char *format, ...))
 {
-       if (o->type == FIO_OPT_FLOAT_LIST){
+       if (o->type == FIO_OPT_FLOAT_LIST) {
                if (o->minfp == DBL_MIN && o->maxfp == DBL_MAX)
                        return;
 
@@ -58,7 +58,7 @@ static void show_option_range(struct fio_option *o,
                if (o->maxfp != DBL_MAX)
                        logger(", max=%f", o->maxfp);
                logger("\n");
-       } else {
+       } else if (!o->posval[0].ival) {
                if (!o->minval && !o->maxval)
                        return;
 
@@ -479,7 +479,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                }
                        }
                        if (ret) {
-                               log_err("value %d not in allowed range\n",ull);
+                               log_err("fio: value %llu not allowed:\n", ull);
+                               show_option_values(o);
                                return 1;
                        }
                }
@@ -958,9 +959,8 @@ int parse_option(char *opt, const char *input,
                return 1;
        }
 
-       if (!handle_option(*o, post, data)) {
+       if (!handle_option(*o, post, data))
                return 0;
-       }
 
        log_err("fio: failed parsing %s\n", input);
        return 1;
@@ -1169,6 +1169,11 @@ void option_init(struct fio_option *o)
        }
        if (!o->cb && (!o->off1 && !o->roff1))
                log_err("Option %s: neither cb nor offset given\n", o->name);
+       if (!o->category) {
+               log_info("Options %s: no category defined. Setting to misc\n", o->name);
+               o->category = FIO_OPT_C_GENERAL;
+               o->group = FIO_OPT_G_INVALID;
+       }
        if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
            o->type == FIO_OPT_STR_MULTI)
                return;
@@ -1188,8 +1193,11 @@ void options_init(struct fio_option *options)
 
        dprint(FD_PARSE, "init options\n");
 
-       for (o = &options[0]; o->name; o++)
+       for (o = &options[0]; o->name; o++) {
                option_init(o);
+               if (o->inverse)
+                       o->inv_opt = find_option(options, o->inverse);
+       }
 }
 
 void options_free(struct fio_option *options, void *data)