parse: get rid of raw option offsets

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 68a7338e32d34ed929cb5173c18df43273e2920f..66b1850ae9e753243e6289156c299bee79c447dc 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -33,44 +33,27 @@ struct value_pair {
 };
 
 #define OPT_LEN_MAX    4096
-#define PARSE_MAX_VP   16
-
-enum opt_category {
-       FIO_OPT_G_DESC          = 1UL << 0,
-       FIO_OPT_G_FILE          = 1UL << 1,
-       FIO_OPT_G_MISC          = 1UL << 2,
-       FIO_OPT_G_IO            = 1UL << 3,
-       FIO_OPT_G_IO_DDIR       = 1UL << 4,
-       FIO_OPT_G_IO_BUF        = 1UL << 5,
-       FIO_OPT_G_RAND          = 1UL << 6,
-       FIO_OPT_G_OS            = 1UL << 7,
-       FIO_OPT_G_MEM           = 1UL << 8,
-       FIO_OPT_G_VERIFY        = 1UL << 9,
-       FIO_OPT_G_CPU           = 1UL << 10,
-       FIO_OPT_G_LOG           = 1UL << 11,
-       FIO_OPT_G_ZONE          = 1UL << 12,
-       FIO_OPT_G_CACHE         = 1UL << 13,
-       FIO_OPT_G_STAT          = 1UL << 14,
-       FIO_OPT_G_ERR           = 1UL << 15,
-       FIO_OPT_G_JOB           = 1UL << 16,
-};
+#define PARSE_MAX_VP   24
 
 /*
  * Option define
  */
 struct fio_option {
        const char *name;               /* option name */
+       const char *lname;              /* long option name */
        const char *alias;              /* possible old allowed name */
        enum fio_opt_type type;         /* option type */
        unsigned int off1;              /* potential parameters */
        unsigned int off2;
        unsigned int off3;
        unsigned int off4;
-       void *roff1, *roff2, *roff3, *roff4;
+       unsigned int off5;
+       unsigned int off6;
        unsigned int maxval;            /* max and min value */
        int minval;
        double maxfp;                   /* max and min floating value */
        double minfp;
+       unsigned int interval;          /* client hint for suitable interval */
        unsigned int maxlen;            /* max length */
        int neg;                        /* negate value stored */
        int prio;
@@ -79,14 +62,21 @@ struct fio_option {
        const char *def;                /* default setting */
        struct value_pair posval[PARSE_MAX_VP];/* possible values */
        const char *parent;             /* parent option */
+       int hide;                       /* hide if parent isn't set */
+       int hide_on_set;                /* hide on set, not on unset */
+       const char *inverse;            /* if set, apply opposite action to this option */
+       struct fio_option *inv_opt;     /* cached lookup */
        int (*verify)(struct fio_option *, void *);
        const char *prof_name;          /* only valid for specific profile */
-       unsigned int category;          /* for type grouping */
+       void *prof_opts;
+       unsigned int category;          /* what type of option */
+       unsigned int group;             /* who to group with */
+       void *gui_data;
 };
 
 typedef int (str_cb_fn)(void *, char *);
 
-extern int parse_option(char *, const char *, struct fio_option *, struct fio_option **, void *);
+extern int parse_option(char *, const char *, struct fio_option *, struct fio_option **, void *, int);
 extern void sort_options(char **, struct fio_option *, int);
 extern int parse_cmd_option(const char *t, const char *l, struct fio_option *, void *);
 extern int show_cmd_help(struct fio_option *, const char *);
@@ -98,6 +88,9 @@ extern void options_free(struct fio_option *, void *);
 extern void strip_blank_front(char **);
 extern void strip_blank_end(char *);
 extern int str_to_decimal(const char *, long long *, int, void *);
+extern int check_str_bytes(const char *p, long long *val, void *data);
+extern int check_str_time(const char *p, long long *val);
+extern int str_to_float(const char *str, double *val);
 
 /*
  * Handlers for the options
@@ -109,13 +102,6 @@ typedef int (fio_opt_str_set_fn)(void *);
 
 #define td_var(start, offset)  ((void *) start + (offset))
 
-#ifndef min
-#define min(a, b)      ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b)      ((a) > (b) ? (a) : (b))
-#endif
-
 static inline int parse_is_percent(unsigned long long val)
 {
        return val <= -1ULL && val >= (-1ULL - 100ULL);