Add sample zipf distribution randomizer

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 5b1a53deb748a1beb61dfce5ae5b62c087b7c2c4..b2f9e5a0969439bd1ffe7d4e303ed3af88f0727f 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -1,17 +1,22 @@
 #ifndef FIO_PARSE_H
 #define FIO_PARSE_H
 
+#include "flist.h"
+
 /*
  * Option types
  */
 enum fio_opt_type {
-       FIO_OPT_STR = 0,
+       FIO_OPT_INVALID = 0,
+       FIO_OPT_STR,
+       FIO_OPT_STR_MULTI,
        FIO_OPT_STR_VAL,
        FIO_OPT_STR_VAL_TIME,
        FIO_OPT_STR_STORE,
        FIO_OPT_RANGE,
        FIO_OPT_INT,
        FIO_OPT_BOOL,
+       FIO_OPT_FLOAT_LIST,
        FIO_OPT_STR_SET,
        FIO_OPT_DEPRECATED,
 };
@@ -23,10 +28,12 @@ struct value_pair {
        const char *ival;               /* string option */
        unsigned int oval;              /* output value */
        const char *help;               /* help text for sub option */
+       int or;                         /* OR value */
+       void *cb;                       /* sub-option callback */
 };
 
-#define OPT_LEN_MAX    1024
-#define PARSE_MAX_VP   16
+#define OPT_LEN_MAX    4096
+#define PARSE_MAX_VP   24
 
 /*
  * Option define
@@ -39,30 +46,40 @@ struct fio_option {
        unsigned int off2;
        unsigned int off3;
        unsigned int off4;
+       unsigned int off5;
+       unsigned int off6;
+       void *roff1, *roff2, *roff3, *roff4, *roff5, *roff6;
        unsigned int maxval;            /* max and min value */
        int minval;
+       double maxfp;                   /* max and min floating value */
+       double minfp;
+       unsigned int maxlen;            /* max length */
        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 */
+       struct value_pair posval[PARSE_MAX_VP];/* possible values */
        const char *parent;             /* parent option */
        int (*verify)(struct fio_option *, void *);
+       const char *prof_name;          /* only valid for specific profile */
 };
 
 typedef int (str_cb_fn)(void *, char *);
 
-extern int parse_option(const char *, struct fio_option *, void *);
+extern int parse_option(char *, const char *, struct fio_option *, 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 *);
+extern void option_init(struct fio_option *);
 extern void options_init(struct fio_option *);
+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 str_to_float(const char *str, double *val);
 
 /*
  * Handlers for the options
@@ -74,11 +91,9 @@ 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);
+}
 
 #endif