parser: get rid of useless is_time variable
[fio.git] / parse.c
diff --git a/parse.c b/parse.c
index d44d13082c91dd8951cbe0be7edf2c51dd73d7e0..e9eb73852dbccbeb630b415db7220678054553ad 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -12,6 +12,7 @@
 
 #include "parse.h"
 #include "debug.h"
+#include "options.h"
 
 static struct fio_option *fio_options;
 extern unsigned int fio_get_kb_base(void *);
@@ -55,20 +56,19 @@ static void show_option_range(struct fio_option *o, FILE *out)
 
 static void show_option_values(struct fio_option *o)
 {
-       int i = 0;
+       int i;
 
-       do {
+       for (i = 0; i < PARSE_MAX_VP; i++) {
                const struct value_pair *vp = &o->posval[i];
 
                if (!vp->ival)
-                       break;
+                       continue;
 
                printf("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
                if (vp->help)
                        printf(" %s", vp->help);
                printf("\n");
-               i++;
-       } while (i < PARSE_MAX_VP);
+       }
 
        if (i)
                printf("\n");
@@ -77,6 +77,8 @@ static void show_option_values(struct fio_option *o)
 static void show_option_help(struct fio_option *o, FILE *out)
 {
        const char *typehelp[] = {
+               "invalid",
+               "string (opt=bla)",
                "string (opt=bla)",
                "string with possible k/m/g postfix (opt=4k)",
                "string with time postfix (opt=10s)",
@@ -85,6 +87,7 @@ static void show_option_help(struct fio_option *o, FILE *out)
                "integer value (opt=100)",
                "boolean value (opt=1)",
                "no argument (opt)",
+               "deprecated",
        };
 
        if (o->alias)
@@ -92,6 +95,8 @@ static void show_option_help(struct fio_option *o, FILE *out)
 
        fprintf(out, "%20s: %s\n", "type", typehelp[o->type]);
        fprintf(out, "%20s: %s\n", "default", o->def ? o->def : "no default");
+       if (o->prof_name)
+               fprintf(out, "%20s: only for profile '%s'\n", "valid", o->prof_name);
        show_option_range(o, stdout);
        show_option_values(o);
 }
@@ -113,35 +118,75 @@ static unsigned long get_mult_time(char c)
        }
 }
 
-static unsigned long long get_mult_bytes(char c, void *data)
+static unsigned long long __get_mult_bytes(const char *p, void *data)
 {
        unsigned int kb_base = fio_get_kb_base(data);
        unsigned long long ret = 1;
+       unsigned int i, pow = 0, mult = kb_base;
+       char *c;
 
-       switch (c) {
-       default:
-               break;
-       case 'p':
-       case 'P':
-               ret *= (unsigned long long) kb_base;
-       case 't':
-       case 'T':
-               ret *= (unsigned long long) kb_base;
-       case 'g':
-       case 'G':
-               ret *= (unsigned long long) kb_base;
-       case 'm':
-       case 'M':
-               ret *= (unsigned long long) kb_base;
-       case 'k':
-       case 'K':
-               ret *= (unsigned long long) kb_base;
-               break;
-       }
+       if (!p)
+               return 1;
 
+       c = strdup(p);
+
+       for (i = 0; i < strlen(c); i++)
+               c[i] = tolower(c[i]);
+
+       if (!strcmp("pib", c)) {
+               pow = 5;
+               mult = 1000;
+       } else if (!strcmp("tib", c)) {
+               pow = 4;
+               mult = 1000;
+       } else if (!strcmp("gib", c)) {
+               pow = 3;
+               mult = 1000;
+       } else if (!strcmp("mib", c)) {
+               pow = 2;
+               mult = 1000;
+       } else if (!strcmp("kib", c)) {
+               pow = 1;
+               mult = 1000;
+       } else if (!strcmp("p", c) || !strcmp("pb", c))
+               pow = 5;
+       else if (!strcmp("t", c) || !strcmp("tb", c))
+               pow = 4;
+       else if (!strcmp("g", c) || !strcmp("gb", c))
+               pow = 3;
+       else if (!strcmp("m", c) || !strcmp("mb", c))
+               pow = 2;
+       else if (!strcmp("k", c) || !strcmp("kb", c))
+               pow = 1;
+
+       while (pow--)
+               ret *= (unsigned long long) mult;
+
+       free(c);
        return ret;
 }
 
+static unsigned long long get_mult_bytes(const char *str, int len, void *data)
+{
+       const char *p;
+
+       if (len < 2)
+               return __get_mult_bytes(str, data);
+
+       /*
+        * if the last char is 'b' or 'B', the user likely used
+        * "1gb" instead of just "1g". If the second to last is also
+        * a letter, adjust.
+        */
+       p = str + len - 1;
+       while (isalpha(*(p - 1)))
+               p--;
+       if (!isalpha(*p))
+               p = NULL;
+
+       return __get_mult_bytes(p, data);
+}
+
 /*
  * convert string into decimal value, noting any size suffix
  */
@@ -162,19 +207,9 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data)
        if (*val == LONG_MAX && errno == ERANGE)
                return 1;
 
-       if (kilo) {
-               const char *p;
-               /*
-                * if the last char is 'b' or 'B', the user likely used
-                * "1gb" instead of just "1g". If the second to last is also
-                * a letter, adjust.
-                */
-               p = str + len - 1;
-               if ((*p == 'b' || *p == 'B') && isalpha(*(p - 1)))
-                       --p;
-
-               *val *= get_mult_bytes(*p, data);
-       } else
+       if (kilo)
+               *val *= get_mult_bytes(str, len, data);
+       else
                *val *= get_mult_time(str[len - 1]);
 
        return 0;
@@ -222,19 +257,13 @@ void strip_blank_end(char *p)
 
 static int check_range_bytes(const char *str, long *val, void *data)
 {
-       char suffix;
-
-       if (!strlen(str))
-               return 1;
+       long long __val;
 
-       if (sscanf(str, "%lu%c", val, &suffix) == 2) {
-               *val *= get_mult_bytes(suffix, data);
+       if (!str_to_decimal(str, &__val, 1, data)) {
+               *val = __val;
                return 0;
        }
 
-       if (sscanf(str, "%lu", val) == 1)
-               return 0;
-
        return 1;
 }
 
@@ -253,25 +282,24 @@ static int check_int(const char *p, int *val)
        return 1;
 }
 
-static struct fio_option *find_option(struct fio_option *options,
-                                     const char *opt)
+static int opt_len(const char *str)
 {
-       struct fio_option *o;
+       char *postfix;
 
-       for (o = &options[0]; o->name; o++) {
-               if (!strcmp(o->name, opt))
-                       return o;
-               else if (o->alias && !strcmp(o->alias, opt))
-                       return o;
-       }
+       postfix = strchr(str, ':');
+       if (!postfix)
+               return strlen(str);
 
-       return NULL;
+       return (int)(postfix - str);
 }
 
-#define val_store(ptr, val, off, data)                 \
+#define val_store(ptr, val, off, or, data)             \
        do {                                            \
                ptr = td_var((data), (off));            \
-               *ptr = (val);                           \
+               if ((or))                               \
+                       *ptr |= (val);                  \
+               else                                    \
+                       *ptr = (val);                   \
        } while (0)
 
 static int __handle_option(struct fio_option *o, const char *ptr, void *data,
@@ -281,7 +309,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        long long ull, *ullp;
        long ul1, ul2;
        char **cp;
-       int ret = 0, is_time = 0;
+       int ret = 0;
 
        dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
                                                        o->type, ptr);
@@ -292,45 +320,51 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        }
 
        switch (o->type) {
-       case FIO_OPT_STR: {
+       case FIO_OPT_STR:
+       case FIO_OPT_STR_MULTI: {
                fio_opt_str_fn *fn = o->cb;
                const struct value_pair *vp;
                struct value_pair posval[PARSE_MAX_VP];
-               int i;
+               int i, all_skipped = 1;
 
                posval_sort(o, posval);
 
+               ret = 1;
                for (i = 0; i < PARSE_MAX_VP; i++) {
                        vp = &posval[i];
                        if (!vp->ival || vp->ival[0] == '\0')
-                               break;
-                       ret = 1;
-                       if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
+                               continue;
+                       all_skipped = 0;
+                       if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
                                ret = 0;
-                               if (!o->off1)
-                                       break;
-                               val_store(ilp, vp->oval, o->off1, data);
-                               break;
+                               if (o->roff1) {
+                                       if (vp->or)
+                                               *(unsigned int *) o->roff1 |= vp->oval;
+                                       else
+                                               *(unsigned int *) o->roff1 = vp->oval;
+                               } else {
+                                       if (!o->off1)
+                                               continue;
+                                       val_store(ilp, vp->oval, o->off1, vp->or, data);
+                               }
+                               continue;
                        }
                }
 
-               if (ret)
+               if (ret && !all_skipped)
                        show_option_values(o);
                else if (fn)
                        ret = fn(data, ptr);
                break;
        }
-       case FIO_OPT_STR_VAL_TIME:
-               is_time = 1;
-       case FIO_OPT_INT:
-       case FIO_OPT_STR_VAL: {
-               fio_opt_str_val_fn *fn = o->cb;
+       case FIO_OPT_STR_VAL_TIME: {
+               fio_opt_str_val_fn *fn;
 
-               if (is_time)
-                       ret = check_str_time(ptr, &ull);
-               else
-                       ret = check_str_bytes(ptr, &ull, data);
+               ret = check_str_time(ptr, &ull);
+       case FIO_OPT_INT:
+       case FIO_OPT_STR_VAL:
 
+               ret = check_str_bytes(ptr, &ull, data);
                if (ret)
                        break;
 
@@ -345,19 +379,36 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        return 1;
                }
 
+               fn = o->cb;
                if (fn)
                        ret = fn(data, &ull);
                else {
                        if (o->type == FIO_OPT_INT) {
-                               if (first)
-                                       val_store(ilp, ull, o->off1, data);
-                               if (!more && o->off2)
-                                       val_store(ilp, ull, o->off2, data);
+                               if (first) {
+                                       if (o->roff1)
+                                               *(unsigned int *) o->roff1 = ull;
+                                       else
+                                               val_store(ilp, ull, o->off1, 0, data);
+                               }
+                               if (!more) {
+                                       if (o->roff2)
+                                               *(unsigned int *) o->roff2 = ull;
+                                       else if (o->off2)
+                                               val_store(ilp, ull, o->off2, 0, data);
+                               }
                        } else {
-                               if (first)
-                                       val_store(ullp, ull, o->off1, data);
-                               if (!more && o->off2)
-                                       val_store(ullp, ull, o->off2, data);
+                               if (first) {
+                                       if (o->roff1)
+                                               *(unsigned long long *) o->roff1 = ull;
+                                       else
+                                               val_store(ullp, ull, o->off1, 0, data);
+                               }
+                               if (!more) {
+                                       if (o->roff2)
+                                               *(unsigned long long *) o->roff2 =  ull;
+                                       else if (o->off2)
+                                               val_store(ullp, ull, o->off2, 0, data);
+                               }
                        }
                }
                break;
@@ -365,7 +416,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        case FIO_OPT_STR_STORE: {
                fio_opt_str_fn *fn = o->cb;
 
-               cp = td_var(data, o->off1);
+               if (o->roff1)
+                       cp = (char **) o->roff1;
+               else
+                       cp = td_var(data, o->off1);
+
                *cp = strdup(ptr);
                if (fn) {
                        ret = fn(data, ptr);
@@ -407,12 +462,21 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        }
 
                        if (first) {
-                               val_store(ilp, ul1, o->off1, data);
-                               val_store(ilp, ul2, o->off2, data);
+                               if (o->roff1)
+                                       *(unsigned int *) o->roff1 = ul1;
+                               else
+                                       val_store(ilp, ul1, o->off1, 0, data);
+                               if (o->roff2)
+                                       *(unsigned int *) o->roff2 = ul2;
+                               else
+                                       val_store(ilp, ul2, o->off2, 0, data);
                        }
-                       if (o->off3 && o->off4) {
-                               val_store(ilp, ul1, o->off3, data);
-                               val_store(ilp, ul2, o->off4, data);
+                       if (o->roff3 && o->roff4) {
+                               *(unsigned int *) o->roff3 = ul1;
+                               *(unsigned int *) o->roff4 = ul2;
+                       } else if (o->off3 && o->off4) {
+                               val_store(ilp, ul1, o->off3, 0, data);
+                               val_store(ilp, ul2, o->off4, 0, data);
                        }
                }
 
@@ -442,10 +506,18 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                if (fn)
                        ret = fn(data, &il);
                else {
-                       if (first)
-                               val_store(ilp, il, o->off1, data);
-                       if (!more && o->off2)
-                               val_store(ilp, il, o->off2, data);
+                       if (first) {
+                               if (o->roff1)
+                                       *(unsigned int *)o->roff1 = il;
+                               else
+                                       val_store(ilp, il, o->off1, 0, data);
+                       }
+                       if (!more) {
+                               if (o->roff2)
+                                       *(unsigned int *) o->roff2 = il;
+                               else if (o->off2)
+                                       val_store(ilp, il, o->off2, 0, data);
+                       }
                }
                break;
        }
@@ -455,10 +527,18 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                if (fn)
                        ret = fn(data);
                else {
-                       if (first)
-                               val_store(ilp, 1, o->off1, data);
-                       if (!more && o->off2)
-                               val_store(ilp, 1, o->off2, data);
+                       if (first) {
+                               if (o->roff1)
+                                       *(unsigned int *) o->roff1 = 1;
+                               else
+                                       val_store(ilp, 1, o->off1, 0, data);
+                       }
+                       if (!more) {
+                               if (o->roff2)
+                                       *(unsigned int *) o->roff2 = 1;
+                               else if (o->off2)
+                                       val_store(ilp, 1, o->off2, 0, data);
+                       }
                }
                break;
        }
@@ -487,51 +567,59 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
 static int handle_option(struct fio_option *o, const char *__ptr, void *data)
 {
-       char *ptr, *ptr2 = NULL;
-       int r1, r2;
+       char *o_ptr, *ptr, *ptr2;
+       int ret, done;
 
        dprint(FD_PARSE, "handle_option=%s, ptr=%s\n", o->name, __ptr);
 
-       ptr = NULL;
+       o_ptr = ptr = NULL;
        if (__ptr)
-               ptr = strdup(__ptr);
+               o_ptr = ptr = strdup(__ptr);
 
        /*
-        * See if we have a second set of parameters, hidden after a comma.
-        * Do this before parsing the first round, to check if we should
+        * See if we have another set of parameters, hidden after a comma.
+        * Do this before parsing this round, to check if we should
         * copy set 1 options to set 2.
         */
-       if (ptr &&
-           (o->type != FIO_OPT_STR_STORE) &&
-           (o->type != FIO_OPT_STR)) {
-               ptr2 = strchr(ptr, ',');
-               if (ptr2 && *(ptr2 + 1) == '\0')
-                       *ptr2 = '\0';
-               if (!ptr2)
-                       ptr2 = strchr(ptr, ':');
-               if (!ptr2)
-                       ptr2 = strchr(ptr, '-');
-       }
+       done = 0;
+       ret = 1;
+       do {
+               int __ret;
+
+               ptr2 = NULL;
+               if (ptr &&
+                   (o->type != FIO_OPT_STR_STORE) &&
+                   (o->type != FIO_OPT_STR)) {
+                       ptr2 = strchr(ptr, ',');
+                       if (ptr2 && *(ptr2 + 1) == '\0')
+                               *ptr2 = '\0';
+                       if (o->type != FIO_OPT_STR_MULTI) {
+                               if (!ptr2)
+                                       ptr2 = strchr(ptr, ':');
+                               if (!ptr2)
+                                       ptr2 = strchr(ptr, '-');
+                       }
+               }
 
-       /*
-        * Don't return early if parsing the first option fails - if
-        * we are doing multiple arguments, we can allow the first one
-        * being empty.
-        */
-       r1 = __handle_option(o, ptr, data, 1, !!ptr2);
+               /*
+                * Don't return early if parsing the first option fails - if
+                * we are doing multiple arguments, we can allow the first one
+                * being empty.
+                */
+               __ret = __handle_option(o, ptr, data, !done, !!ptr2);
+               if (ret)
+                       ret = __ret;
 
-       if (!ptr2) {
-               if (ptr)
-                       free(ptr);
-               return r1;
-       }
+               if (!ptr2)
+                       break;
 
-       ptr2++;
-       r2 = __handle_option(o, ptr2, data, 0, 0);
+               ptr = ptr2 + 1;
+               done++;
+       } while (1);
 
-       if (ptr)
-               free(ptr);
-       return r1 && r2;
+       if (o_ptr)
+               free(o_ptr);
+       return ret;
 }
 
 static struct fio_option *get_option(const char *opt,
@@ -620,7 +708,7 @@ static char *option_dup_subs(const char *opt)
        ssize_t nchr = OPT_LEN_MAX;
        size_t envlen;
 
-       if (strlen(in) + 1 > OPT_LEN_MAX) {
+       if (strlen(opt) + 1 > OPT_LEN_MAX) {
                fprintf(stderr, "OPT_LEN_MAX (%d) is too small\n", OPT_LEN_MAX);
                return NULL;
        }
@@ -783,7 +871,7 @@ static void print_option(struct fio_option *o)
 int show_cmd_help(struct fio_option *options, const char *name)
 {
        struct fio_option *o, *closest;
-       unsigned int best_dist;
+       unsigned int best_dist = -1U;
        int found = 0;
        int show_all = 0;
 
@@ -797,6 +885,8 @@ int show_cmd_help(struct fio_option *options, const char *name)
 
                if (o->type == FIO_OPT_DEPRECATED)
                        continue;
+               if (!exec_profile && o->prof_name)
+                       continue;
 
                if (name) {
                        if (!strcmp(name, o->name) ||
@@ -816,7 +906,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
                if (show_all || match) {
                        found = 1;
                        if (match)
-                               printf("%24s: %s\n", o->name, o->help);
+                               printf("%20s: %s\n", o->name, o->help);
                        if (show_all) {
                                if (!o->parent)
                                        print_option(o);
@@ -834,7 +924,12 @@ int show_cmd_help(struct fio_option *options, const char *name)
                return 0;
 
        printf("No such command: %s", name);
-       if (closest) {
+
+       /*
+        * Only print an appropriately close option, one where the edit
+        * distance isn't too big. Otherwise we get crazy matches.
+        */
+       if (closest && best_dist < 3) {
                printf(" - showing closest match\n");
                printf("%20s: %s\n", closest->name, closest->help);
                show_option_help(closest, stdout);
@@ -858,6 +953,32 @@ void fill_default_options(void *data, struct fio_option *options)
                        handle_option(o, o->def, data);
 }
 
+void option_init(struct fio_option *o)
+{
+       if (o->type == FIO_OPT_DEPRECATED)
+               return;
+       if (o->type == FIO_OPT_BOOL) {
+               o->minval = 0;
+               o->maxval = 1;
+       }
+       if (o->type == FIO_OPT_STR_SET && o->def) {
+               fprintf(stderr, "Option %s: string set option with"
+                               " default will always be true\n", o->name);
+       }
+       if (!o->cb && (!o->off1 && !o->roff1)) {
+               fprintf(stderr, "Option %s: neither cb nor offset given\n",
+                                                       o->name);
+       }
+       if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
+           o->type == FIO_OPT_STR_MULTI)
+               return;
+       if (o->cb && ((o->off1 || o->off2 || o->off3 || o->off4) ||
+                     (o->roff1 || o->roff2 || o->roff3 || o->roff4))) {
+               fprintf(stderr, "Option %s: both cb and offset given\n",
+                                                        o->name);
+       }
+}
+
 /*
  * Sanitize the options structure. For now it just sets min/max for bool
  * values and whether both callback and offsets are given.
@@ -868,27 +989,6 @@ void options_init(struct fio_option *options)
 
        dprint(FD_PARSE, "init options\n");
 
-       for (o = &options[0]; o->name; o++) {
-               if (o->type == FIO_OPT_DEPRECATED)
-                       continue;
-               if (o->type == FIO_OPT_BOOL) {
-                       o->minval = 0;
-                       o->maxval = 1;
-               }
-               if (o->type == FIO_OPT_STR_SET && o->def) {
-                       fprintf(stderr, "Option %s: string set option with"
-                                       " default will always be true\n",
-                                               o->name);
-               }
-               if (!o->cb && !o->off1) {
-                       fprintf(stderr, "Option %s: neither cb nor offset"
-                                       " given\n", o->name);
-               }
-               if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE)
-                       continue;
-               if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4)) {
-                       fprintf(stderr, "Option %s: both cb and offset given\n",
-                                                                o->name);
-               }
-       }
+       for (o = &options[0]; o->name; o++)
+               option_init(o);
 }