Remove debug printf()

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 2cdac54012515e2629baa7e91a4e52308e752466..9e3c5b17e6707ae0da22a5c8791d7d20a957a1f4 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -56,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");
@@ -78,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)",
@@ -86,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)
@@ -93,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);
 }
@@ -254,40 +257,6 @@ 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,
-                                     struct flist_head *eops, const char *opt)
-{
-       struct flist_head *n;
-       struct fio_option *o;
-
-       for (o = &options[0]; o->name; o++)
-               if (o_match(o, opt))
-                       return o;
-
-       if (!eops)
-               return NULL;
-
-       flist_for_each(n, eops) {
-               struct ext_option *eopt;
-
-               eopt = flist_entry(n, struct ext_option, list);
-               if (o_match(&eopt->o, opt))
-                       return &eopt->o;
-       }
-
-       return NULL;
-}
-
 #define val_store(ptr, val, off, data)                 \
        do {                                            \
                ptr = td_var((data), (off));            \
@@ -323,7 +292,7 @@ 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;
@@ -604,8 +573,7 @@ static int handle_option(struct fio_option *o, const char *__ptr, void *data)
 }
 
 static struct fio_option *get_option(const char *opt,
-                                    struct fio_option *options,
-                                    struct flist_head *eops, char **post)
+                                    struct fio_option *options, char **post)
 {
        struct fio_option *o;
        char *ret;
@@ -617,9 +585,9 @@ static struct fio_option *get_option(const char *opt,
                ret = (char *) opt;
                (*post)++;
                strip_blank_end(ret);
-               o = find_option(options, eops, ret);
+               o = find_option(options, ret);
        } else {
-               o = find_option(options, eops, opt);
+               o = find_option(options, opt);
                *post = NULL;
        }
 
@@ -635,8 +603,8 @@ static int opt_cmp(const void *p1, const void *p2)
        s1 = strdup(*((char **) p1));
        s2 = strdup(*((char **) p2));
 
-       o1 = get_option(s1, fio_options, NULL, &foo);
-       o2 = get_option(s2, fio_options, NULL, &foo);
+       o1 = get_option(s1, fio_options, &foo);
+       o2 = get_option(s2, fio_options, &foo);
 
        prio1 = prio2 = 0;
        if (o1)
@@ -657,12 +625,11 @@ void sort_options(char **opts, struct fio_option *options, int num_opts)
 }
 
 int parse_cmd_option(const char *opt, const char *val,
-                    struct fio_option *options, struct flist_head *eops,
-                    void *data)
+                    struct fio_option *options, void *data)
 {
        struct fio_option *o;
 
-       o = find_option(options, eops, opt);
+       o = find_option(options, opt);
        if (!o) {
                fprintf(stderr, "Bad option <%s>\n", opt);
                return 1;
@@ -691,7 +658,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;
        }
@@ -729,8 +696,7 @@ static char *option_dup_subs(const char *opt)
        return strdup(out);
 }
 
-int parse_option(const char *opt, struct fio_option *options,
-                struct flist_head *ext_opt_list, void *data)
+int parse_option(const char *opt, struct fio_option *options, void *data)
 {
        struct fio_option *o;
        char *post, *tmp;
@@ -739,7 +705,7 @@ int parse_option(const char *opt, struct fio_option *options,
        if (!tmp)
                return 1;
 
-       o = get_option(tmp, options, ext_opt_list, &post);
+       o = get_option(tmp, options, &post);
        if (!o) {
                fprintf(stderr, "Bad option <%s>\n", tmp);
                free(tmp);
@@ -869,6 +835,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) ||
@@ -888,7 +856,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);
@@ -942,13 +910,14 @@ void option_init(struct fio_option *o)
                fprintf(stderr, "Option %s: string set option with"
                                " default will always be true\n", o->name);
        }
-       if (!o->cb && !o->off1) {
+       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)) {
+       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);
        }