Allow holes in the option posval (possible values)
[fio.git] / parse.c
diff --git a/parse.c b/parse.c
index a55e52b02e513bc0c02603e4c1eb801f435029a9..f5a35fbce7e9e086da5e4cdb2e6cf35a1ba69d66 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,7 @@ 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 with possible k/m/g postfix (opt=4k)",
                "string with time postfix (opt=10s)",
@@ -85,6 +86,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 +94,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);
 }
@@ -253,17 +257,24 @@ static int check_int(const char *p, int *val)
        return 1;
 }
 
+static inline int o_match(struct fio_option *o, const char *opt)
+{
+       if (!strcmp(o->name, opt))
+               return 1;
+       else if (o->alias && !strcmp(o->alias, opt))
+               return 1;
+
+       return 0;
+}
+
 static struct fio_option *find_option(struct fio_option *options,
                                      const char *opt)
 {
        struct fio_option *o;
 
-       for (o = &options[0]; o->name; o++) {
-               if (!strcmp(o->name, opt))
-                       return o;
-               else if (o->alias && !strcmp(o->alias, opt))
+       for (o = &options[0]; o->name; o++)
+               if (o_match(o, opt))
                        return o;
-       }
 
        return NULL;
 }
@@ -303,13 +314,17 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                for (i = 0; i < PARSE_MAX_VP; i++) {
                        vp = &posval[i];
                        if (!vp->ival || vp->ival[0] == '\0')
-                               break;
+                               continue;
                        ret = 1;
                        if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
                                ret = 0;
-                               if (!o->off1)
-                                       break;
-                               val_store(ilp, vp->oval, o->off1, data);
+                               if (o->roff1)
+                                       *(unsigned int *) o->roff1 = vp->oval;
+                               else {
+                                       if (!o->off1)
+                                               break;
+                                       val_store(ilp, vp->oval, o->off1, data);
+                               }
                                break;
                        }
                }
@@ -349,15 +364,31 @@ 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 long long *) o->roff1 = ull;
+                                       else
+                                               val_store(ilp, ull, o->off1, data);
+                               }
+                               if (!more) {
+                                       if (o->roff2)
+                                               *(unsigned long long *) o->roff2 = ull;
+                                       else if (o->off2)
+                                               val_store(ilp, ull, o->off2, 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, data);
+                               }
+                               if (!more) {
+                                       if (o->roff2)
+                                               *(unsigned long long *) o->roff2 =  ull;
+                                       else if (o->off2)
+                                               val_store(ullp, ull, o->off2, data);
+                               }
                        }
                }
                break;
@@ -365,7 +396,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,10 +442,19 @@ 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 long *) o->roff1 = ul1;
+                               else
+                                       val_store(ilp, ul1, o->off1, data);
+                               if (o->roff2)
+                                       *(unsigned long *) o->roff2 = ul2;
+                               else
+                                       val_store(ilp, ul2, o->off2, data);
                        }
-                       if (o->off3 && o->off4) {
+                       if (o->roff3 && o->roff4) {
+                               *(unsigned long *) o->roff3 = ul1;
+                               *(unsigned long *) o->roff4 = ul2;
+                       } else if (o->off3 && o->off4) {
                                val_store(ilp, ul1, o->off3, data);
                                val_store(ilp, ul2, o->off4, data);
                        }
@@ -442,10 +486,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, data);
+                       }
+                       if (!more) {
+                               if (o->roff2)
+                                       *(unsigned int *) o->roff2 = il;
+                               else if (o->off2)
+                                       val_store(ilp, il, o->off2, data);
+                       }
                }
                break;
        }
@@ -455,10 +507,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, data);
+                       }
+                       if (!more) {
+                               if (o->roff2)
+                                       *(unsigned int *) o->roff2 = 1;
+                               else if (o->off2)
+                                       val_store(ilp, 1, o->off2, data);
+                       }
                }
                break;
        }
@@ -620,6 +680,11 @@ static char *option_dup_subs(const char *opt)
        ssize_t nchr = OPT_LEN_MAX;
        size_t envlen;
 
+       if (strlen(in) + 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,6 +724,8 @@ 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) {
@@ -790,6 +857,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 +878,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);
@@ -851,6 +920,31 @@ 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)
+               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.
@@ -861,27 +955,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);
 }