Add parser support for out-of-td option storage

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index c3b66d75be34216ff1f3df33b85db9d7779ef6c6..95d99f56c08d4cdef2bb41a3a18fc5b0efb05cd6 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -1,19 +1,21 @@
 #ifndef FIO_PARSE_H
 #define FIO_PARSE_H
 
+#include "flist.h"
+
 /*
  * Option types
  */
 enum fio_opt_type {
        FIO_OPT_STR = 0,
        FIO_OPT_STR_VAL,
-       FIO_OPT_STR_VAL_INT,
        FIO_OPT_STR_VAL_TIME,
        FIO_OPT_STR_STORE,
        FIO_OPT_RANGE,
        FIO_OPT_INT,
        FIO_OPT_BOOL,
        FIO_OPT_STR_SET,
+       FIO_OPT_DEPRECATED,
 };
 
 /*
@@ -25,6 +27,7 @@ struct value_pair {
        const char *help;               /* help text for sub option */
 };
 
+#define OPT_LEN_MAX    4096
 #define PARSE_MAX_VP   16
 
 /*
@@ -38,26 +41,32 @@ struct fio_option {
        unsigned int off2;
        unsigned int off3;
        unsigned int off4;
+       void *roff1, *roff2, *roff3, *roff4;
        unsigned int maxval;            /* max and min value */
        int minval;
        int neg;                        /* negate value stored */
+       int prio;
        void *cb;                       /* callback */
        const char *help;               /* help text for option */
        const char *def;                /* default setting */
        const struct value_pair posval[PARSE_MAX_VP];/* possible values */
        const char *parent;             /* parent option */
+       int (*verify)(struct fio_option *, void *);
 };
 
 typedef int (str_cb_fn)(void *, char *);
 
-extern int parse_option(const char *, struct fio_option *, void *);
-extern int parse_cmd_option(const char *t, const char *l, struct fio_option *, void *);
+extern int parse_option(const char *, struct fio_option *, struct flist_head *, void *);
+extern void sort_options(char **, struct fio_option *, int);
+extern int parse_cmd_option(const char *t, const char *l, struct fio_option *, struct flist_head *, void *);
 extern int show_cmd_help(struct fio_option *, const char *);
 extern void fill_default_options(void *, struct fio_option *);
+extern void option_init(struct fio_option *);
 extern void options_init(struct fio_option *);
 
 extern void strip_blank_front(char **);
 extern void strip_blank_end(char *);
+extern int str_to_decimal(const char *, long long *, int, void *);
 
 /*
  * Handlers for the options