pre_read fixes

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 4ddb76a6335d6af7834e1209b8517fb125f01d6d..45462596ca4246dd6a7b4eac7600a2936c241b81 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -14,8 +14,21 @@ enum fio_opt_type {
        FIO_OPT_INT,
        FIO_OPT_BOOL,
        FIO_OPT_STR_SET,
+       FIO_OPT_DEPRECATED,
 };
 
+/*
+ * Match a possible value string with the integer option.
+ */
+struct value_pair {
+       const char *ival;               /* string option */
+       unsigned int oval;              /* output value */
+       const char *help;               /* help text for sub option */
+};
+
+#define OPT_LEN_MAX    1024
+#define PARSE_MAX_VP   16
+
 /*
  * Option define
  */
@@ -29,15 +42,19 @@ struct fio_option {
        unsigned int off4;
        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 char *posval[16];         /* possible values */
+       const struct value_pair posval[PARSE_MAX_VP];/* possible values */
+       const char *parent;             /* parent option */
 };
 
 typedef int (str_cb_fn)(void *, char *);
 
 extern int parse_option(const char *, struct fio_option *, void *);
+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 *);
 extern void fill_default_options(void *, struct fio_option *);
@@ -45,6 +62,7 @@ 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);
 
 /*
  * Handlers for the options
@@ -56,4 +74,11 @@ 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
+
 #endif