Add suboption help texts

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 414f77c859849046d116a6e76d06fa5342fd3d0c..752da346d2aabbfc3c57280211b5086f1480c79e 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -16,22 +16,35 @@ enum fio_opt_type {
        FIO_OPT_STR_SET,
 };
 
+/*
+ * 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 PARSE_MAX_VP   16
+
 /*
  * Option define
  */
 struct fio_option {
        const char *name;               /* 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;
        unsigned int maxval;            /* max and min value */
-       unsigned int minval;
+       int minval;
+       int neg;                        /* negate value stored */
        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 */
 };
 
 typedef int (str_cb_fn)(void *, char *);
@@ -49,10 +62,17 @@ extern void strip_blank_end(char *);
  * Handlers for the options
  */
 typedef int (fio_opt_str_fn)(void *, const char *);
-typedef int (fio_opt_str_val_fn)(void *, unsigned long long *);
-typedef int (fio_opt_int_fn)(void *, unsigned int *);
+typedef int (fio_opt_str_val_fn)(void *, long long *);
+typedef int (fio_opt_int_fn)(void *, int *);
 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