Merge branch 'master' into gfio

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 92501338d456fde659af69beb8066ce239f39a8a..e8b628cee7be114d2579aa5a1d2fe75515653127 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -49,7 +49,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;
 
@@ -57,7 +57,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;
 
@@ -139,6 +139,19 @@ static unsigned long get_mult_time(char c)
        }
 }
 
+static int is_separator(char c)
+{
+       switch (c) {
+       case ':':
+       case '-':
+       case ',':
+       case '/':
+               return 1;
+       default:
+               return 0;
+       }
+}
+
 static unsigned long long __get_mult_bytes(const char *p, void *data,
                                           int *percent)
 {
@@ -152,8 +165,13 @@ static unsigned long long __get_mult_bytes(const char *p, void *data,
 
        c = strdup(p);
 
-       for (i = 0; i < strlen(c); i++)
+       for (i = 0; i < strlen(c); i++) {
                c[i] = tolower(c[i]);
+               if (is_separator(c[i])) {
+                       c[i] = '\0';
+                       break;
+               }
+       }
 
        if (!strncmp("pib", c, 3)) {
                pow = 5;
@@ -446,6 +464,25 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                        " (%u min)\n", ull, o->minval);
                        return 1;
                }
+               if (o->posval[0].ival) {
+                       posval_sort(o, posval);
+
+                       ret = 1;
+                       for (i = 0; i < PARSE_MAX_VP; i++) {
+                               vp = &posval[i];
+                               if (!vp->ival || vp->ival[0] == '\0')
+                                       continue;
+                               if (vp->oval == ull) {
+                                       ret = 0;
+                                       break;
+                               }
+                       }
+                       if (ret) {
+                               log_err("fio: value %llu not allowed:\n", ull);
+                               show_option_values(o);
+                               return 1;
+                       }
+               }
 
                if (fn)
                        ret = fn(data, &ull);
@@ -1131,6 +1168,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("Option %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;
@@ -1138,10 +1180,6 @@ void option_init(struct fio_option *o)
                      (o->roff1 || o->roff2 || o->roff3 || o->roff4))) {
                log_err("Option %s: both cb and 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;
-       }
 }
 
 /*