[PATCH] Introduce bool option type

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 2e8a2a520f3906a66e608a7900f02c7a8f534221..1cc55dc63ed8b1af03b9e81a51592311fdc748f3 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -244,7 +244,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
                break;
        }
-       case FIO_OPT_INT: {
+       case FIO_OPT_INT:
+       case FIO_OPT_BOOL: {
                fio_opt_int_fn *fn = o->cb;
 
                ret = check_int(ptr, &il);
@@ -366,6 +367,38 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
        return 1;
 }
 
+static void show_option_range(struct fio_option *o)
+{
+       if (!o->minval && !o->maxval)
+               return;
+
+       printf("%16s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+}
+
+static void show_option_values(struct fio_option *o)
+{
+       const char *msg;
+       int i = 0;
+
+       if (!o->posval)
+               return;
+
+       do {
+               msg = o->posval[i];
+               if (!msg)
+                       break;
+
+               if (!i)
+                       printf("%16s: ", "valid values");
+
+               printf("%s,", msg);
+               i++;
+       } while (1);
+
+       if (i)
+               printf("\n");
+}
+
 int show_cmd_help(struct fio_option *options, const char *name)
 {
        int show_all = !strcmp(name, "all");
@@ -378,6 +411,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
                "string (opt=bla)",
                "string with dual range (opt=1k-4k,4k-8k)",
                "integer value (opt=100)",
+               "boolean value (opt=1)",
                "no argument (opt)",
        };
        int found = 0;
@@ -391,6 +425,8 @@ int show_cmd_help(struct fio_option *options, const char *name)
                        if (match) {
                                printf("%16s: %s\n", "type", typehelp[o->type]);
                                printf("%16s: %s\n", "default", o->def ? o->def : "no default");
+                               show_option_range(o);
+                               show_option_values(o);
                        }
                }
 
@@ -404,6 +440,9 @@ int show_cmd_help(struct fio_option *options, const char *name)
        return 1;
 }
 
+/*
+ * Handle parsing of default parameters.
+ */
 void fill_default_options(void *data, struct fio_option *options)
 {
        struct fio_option *o = &options[0];
@@ -414,3 +453,20 @@ void fill_default_options(void *data, struct fio_option *options)
                o++;
        }
 }
+
+/*
+ * Sanitize the options structure. For now it just sets min/max for bool
+ * values.
+ */
+void options_init(struct fio_option *options)
+{
+       struct fio_option *o = &options[0];
+
+       while (o->name) {
+               if (o->type == FIO_OPT_BOOL) {
+                       o->minval = 0;
+                       o->maxval = 1;
+               }
+               o++;
+       }
+}