parser: use logging infrastructure
[fio.git] / parse.c
diff --git a/parse.c b/parse.c
index a55e52b02e513bc0c02603e4c1eb801f435029a9..70cfa0b07a46c05f665f68c53659f776c6fa98bd 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -9,9 +9,11 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <math.h>
 
 #include "parse.h"
 #include "debug.h"
+#include "options.h"
 
 static struct fio_option *fio_options;
 extern unsigned int fio_get_kb_base(void *);
@@ -42,41 +44,53 @@ static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
        qsort(vpmap, entries, sizeof(struct value_pair), vp_cmp);
 }
 
-static void show_option_range(struct fio_option *o, FILE *out)
+static void show_option_range(struct fio_option *o,
+                               int (*logger)(const char *format, ...))
 {
-       if (!o->minval && !o->maxval)
-               return;
+       if (o->type == FIO_OPT_FLOAT_LIST){
+               if (isnan(o->minfp) && isnan(o->maxfp))
+                       return;
+
+               logger("%20s: min=%f", "range", o->minfp);
+               if (!isnan(o->maxfp))
+                       logger(", max=%f", o->maxfp);
+               logger("\n");
+       } else {
+               if (!o->minval && !o->maxval)
+                       return;
 
-       fprintf(out, "%20s: min=%d", "range", o->minval);
-       if (o->maxval)
-               fprintf(out, ", max=%d", o->maxval);
-       fprintf(out, "\n");
+               logger("%20s: min=%d", "range", o->minval);
+               if (o->maxval)
+                       logger(", max=%d", o->maxval);
+               logger("\n");
+       }
 }
 
 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);
+               log_info("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
                if (vp->help)
-                       printf(" %s", vp->help);
-               printf("\n");
-               i++;
-       } while (i < PARSE_MAX_VP);
+                       log_info(" %s", vp->help);
+               log_info("\n");
+       }
 
        if (i)
-               printf("\n");
+               log_info("\n");
 }
 
-static void show_option_help(struct fio_option *o, FILE *out)
+static void show_option_help(struct fio_option *o, int is_err)
 {
        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)",
@@ -84,15 +98,25 @@ static void show_option_help(struct fio_option *o, FILE *out)
                "string with dual range (opt=1k-4k,4k-8k)",
                "integer value (opt=100)",
                "boolean value (opt=1)",
+               "list of floating point values separated by ':' (opt=5.9:7.8)",
                "no argument (opt)",
+               "deprecated",
        };
+       int (*logger)(const char *format, ...);
+
+       if (is_err)
+               logger = log_err;
+       else
+               logger = log_info;
 
        if (o->alias)
-               fprintf(out, "%20s: %s\n", "alias", o->alias);
+               logger("%20s: %s\n", "alias", o->alias);
 
-       fprintf(out, "%20s: %s\n", "type", typehelp[o->type]);
-       fprintf(out, "%20s: %s\n", "default", o->def ? o->def : "no default");
-       show_option_range(o, stdout);
+       logger("%20s: %s\n", "type", typehelp[o->type]);
+       logger("%20s: %s\n", "default", o->def ? o->def : "no default");
+       if (o->prof_name)
+               logger("%20s: only for profile '%s'\n", "valid", o->prof_name);
+       show_option_range(o, logger);
        show_option_values(o);
 }
 
@@ -113,35 +137,93 @@ 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,
+                                          int *percent)
 {
        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;
+       else if (!strcmp("%", c)) {
+               *percent = 1;
+               return ret;
        }
 
+       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,
+                                        int *percent)
+{
+       const char *p = str;
+       int digit_seen = 0;
+
+       if (len < 2)
+               return __get_mult_bytes(str, data, percent);
+
+        /*
+         * Go forward until we hit a non-digit, or +/- sign
+         */
+       while ((p - str) <= len) {
+               if (!isdigit((int) *p) &&
+                   (((*p != '+') && (*p != '-')) || digit_seen))
+                       break;
+               digit_seen |= isdigit((int) *p);
+               p++;
+       }
+
+       if (!isalpha((int) *p) && (*p != '%'))
+               p = NULL;
+
+       return __get_mult_bytes(p, data, percent);
+}
+
+/*
+ * Convert string into a floating number. Return 1 for success and 0 otherwise.
+ */
+int str_to_float(const char *str, double *val)
+{
+       return (1 == sscanf(str, "%lf", val));
+}
+
 /*
  * convert string into decimal value, noting any size suffix
  */
@@ -163,17 +245,14 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data)
                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;
+               unsigned long long mult;
+               int perc = 0;
 
-               *val *= get_mult_bytes(*p, data);
+               mult = get_mult_bytes(str, len, data, &perc);
+               if (perc)
+                       *val = -1ULL - *val;
+               else
+                       *val *= mult;
        } else
                *val *= get_mult_time(str[len - 1]);
 
@@ -194,7 +273,7 @@ void strip_blank_front(char **p)
 {
        char *s = *p;
 
-       while (isspace(*s))
+       while (isspace((int) *s))
                s++;
 
        *p = s;
@@ -214,7 +293,7 @@ void strip_blank_end(char *p)
                p = s;
 
        s = p + strlen(p);
-       while ((isspace(*s) || iscntrl(*s)) && (s > start))
+       while ((isspace((int) *s) || iscntrl((int) *s)) && (s > start))
                s--;
 
        *(s + 1) = '\0';
@@ -222,19 +301,13 @@ void strip_blank_end(char *p)
 
 static int check_range_bytes(const char *str, long *val, void *data)
 {
-       char suffix;
+       long long __val;
 
-       if (!strlen(str))
-               return 1;
-
-       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,35 +326,39 @@ 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,
-                          int first, int more)
+                          int first, int more, int curr)
 {
        int il, *ilp;
+       double* flp;
        long long ull, *ullp;
        long ul1, ul2;
+       double uf;
        char **cp;
        int ret = 0, is_time = 0;
+       const struct value_pair *vp;
+       struct value_pair posval[PARSE_MAX_VP];
+       int i, all_skipped = 1;
 
        dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
                                                        o->type, ptr);
@@ -292,29 +369,35 @@ 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;
 
                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);
@@ -349,31 +432,111 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        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;
        }
+       case FIO_OPT_FLOAT_LIST: {
+
+               if (first) {
+                       ul2 = 1;
+                       ilp = td_var(data, o->off2);
+                       *ilp = ul2;
+               }
+               if (curr >= o->maxlen) {
+                       fprintf(stderr, "the list exceeding max length %d\n",
+                                       o->maxlen);
+                       return 1;
+               }
+               if(!str_to_float(ptr, &uf)){
+                       fprintf(stderr, "not a floating point value: %s\n",
+                                       ptr);
+                       return 1;
+               }
+               if (!isnan(o->maxfp) && uf > o->maxfp) {
+                       fprintf(stderr, "value out of range: %f"
+                               " (range max: %f)\n", uf, o->maxfp);
+                       return 1;
+               }
+               if (!isnan(o->minfp) && uf < o->minfp) {
+                       fprintf(stderr, "value out of range: %f"
+                               " (range min: %f)\n", uf, o->minfp);
+                       return 1;
+               }
+
+               flp = td_var(data, o->off1);
+               flp[curr] = uf;
+
+               break;
+       }
        case FIO_OPT_STR_STORE: {
                fio_opt_str_fn *fn = o->cb;
 
-               cp = td_var(data, o->off1);
-               *cp = strdup(ptr);
-               if (fn) {
-                       ret = fn(data, ptr);
-                       if (ret) {
-                               free(*cp);
-                               *cp = NULL;
+               posval_sort(o, posval);
+
+               if (!o->posval[0].ival) {
+                       vp = NULL;
+                       goto match;
+               }
+
+               ret = 1;
+               for (i = 0; i < PARSE_MAX_VP; i++) {
+                       vp = &posval[i];
+                       if (!vp->ival || vp->ival[0] == '\0')
+                               continue;
+                       all_skipped = 0;
+                       if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
+                               char *rest;
+
+                               ret = 0;
+                               if (vp->cb)
+                                       fn = vp->cb;
+match:
+                               if (o->roff1)
+                                       cp = (char **) o->roff1;
+                               else
+                                       cp = td_var(data, o->off1);
+                               *cp = strdup(ptr);
+                               rest = strstr(*cp, ":");
+                               if (rest) {
+                                       *rest = '\0';
+                                       ptr = rest + 1;
+                               } else if (vp && vp->cb)
+                                       ptr = NULL;
+                               break;
                        }
                }
+
+               if (ret && !all_skipped)
+                       show_option_values(o);
+               else if (fn && ptr)
+                       ret = fn(data, ptr);
+
                break;
        }
        case FIO_OPT_RANGE: {
@@ -382,6 +545,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
                strncpy(tmp, ptr, sizeof(tmp) - 1);
 
+               /* Handle bsrange with separate read,write values: */
+               p1 = strchr(tmp, ',');
+               if (p1)
+                       *p1 = '\0';
+
                p1 = strchr(tmp, '-');
                if (!p1) {
                        p1 = strchr(tmp, ':');
@@ -407,21 +575,37 @@ 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);
                        }
                }
 
                break;
        }
-       case FIO_OPT_BOOL: {
+       case FIO_OPT_BOOL:
+       case FIO_OPT_STR_SET: {
                fio_opt_int_fn *fn = o->cb;
 
-               ret = check_int(ptr, &il);
+               if (ptr)
+                       ret = check_int(ptr, &il);
+               else if (o->type == FIO_OPT_BOOL)
+                       ret = 1;
+               else
+                       il = 1;
+
                if (ret)
                        break;
 
@@ -442,31 +626,26 @@ 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);
-               }
-               break;
-       }
-       case FIO_OPT_STR_SET: {
-               fio_opt_str_set_fn *fn = o->cb;
-
-               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 = 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;
        }
        case FIO_OPT_DEPRECATED:
-               fprintf(stdout, "Option %s is deprecated\n", o->name);
+               log_info("Option %s is deprecated\n", o->name);
                break;
        default:
-               fprintf(stderr, "Bad option type %u\n", o->type);
+               log_err("Bad option type %u\n", o->type);
                ret = 1;
        }
 
@@ -478,7 +657,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                if (ret) {
                        fprintf(stderr,"Correct format for offending option\n");
                        fprintf(stderr, "%20s: %s\n", o->name, o->help);
-                       show_option_help(o, stderr);
+                       show_option_help(o, 1);
                }
        }
 
@@ -487,51 +666,62 @@ 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)
+       done = 0;
+       ret = 1;
+       do {
+               int __ret;
+
+               ptr2 = NULL;
+               if (ptr &&
+                   (o->type != FIO_OPT_STR_STORE) &&
+                   (o->type != FIO_OPT_STR) &&
+                   (o->type != FIO_OPT_FLOAT_LIST)) {
+                       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, '-');
+                       }
+               } else if (ptr && o->type == FIO_OPT_FLOAT_LIST) {
                        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, done);
+               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,
@@ -593,14 +783,14 @@ int parse_cmd_option(const char *opt, const char *val,
 
        o = find_option(options, opt);
        if (!o) {
-               fprintf(stderr, "Bad option <%s>\n", opt);
+               log_err("Bad option <%s>\n", opt);
                return 1;
        }
 
        if (!handle_option(o, val, data))
                return 0;
 
-       fprintf(stderr, "fio: failed parsing %s=%s\n", opt, val);
+       log_err("fio: failed parsing %s=%s\n", opt, val);
        return 1;
 }
 
@@ -620,6 +810,11 @@ static char *option_dup_subs(const char *opt)
        ssize_t nchr = OPT_LEN_MAX;
        size_t envlen;
 
+       if (strlen(opt) + 1 > OPT_LEN_MAX) {
+               fprintf(stderr, "OPT_LEN_MAX (%d) is too small\n", OPT_LEN_MAX);
+               return NULL;
+       }
+
        in[OPT_LEN_MAX] = '\0';
        strncpy(in, opt, OPT_LEN_MAX);
 
@@ -659,10 +854,12 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
        char *post, *tmp;
 
        tmp = option_dup_subs(opt);
+       if (!tmp)
+               return 1;
 
        o = get_option(tmp, options, &post);
        if (!o) {
-               fprintf(stderr, "Bad option <%s>\n", tmp);
+               log_err("Bad option <%s>\n", tmp);
                free(tmp);
                return 1;
        }
@@ -672,7 +869,7 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
                return 0;
        }
 
-       fprintf(stderr, "fio: failed parsing %s\n", opt);
+       log_err("fio: failed parsing %s\n", opt);
        free(tmp);
        return 1;
 }
@@ -776,7 +973,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;
 
@@ -790,6 +987,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) ||
@@ -809,7 +1008,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);
@@ -820,17 +1019,22 @@ int show_cmd_help(struct fio_option *options, const char *name)
                if (!match)
                        continue;
 
-               show_option_help(o, stdout);
+               show_option_help(o, 0);
        }
 
        if (found)
                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);
+               show_option_help(closest, 0);
        } else
                printf("\n");
 
@@ -851,6 +1055,33 @@ 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_FLOAT_LIST) {
+               o->minfp = NAN;
+               o->maxfp = NAN;
+       }
+       if (o->type == FIO_OPT_STR_SET && o->def) {
+               log_err("Option %s: string set option with"
+                               " default will always be true\n", o->name);
+       }
+       if (!o->cb && (!o->off1 && !o->roff1))
+               log_err("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))) {
+               log_err("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.
@@ -861,27 +1092,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);
 }