Add support for options being a power-of-2

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 8eefff90c1e88d9b77cd2dba73e41e8e3e88b047..264243b22904f68a6181a99dd85ece446a997251 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -28,7 +28,7 @@ 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 */
+       int orval;                      /* OR value */
        void *cb;                       /* sub-option callback */
 };
 
@@ -72,6 +72,10 @@ struct fio_option {
        unsigned int category;          /* what type of option */
        unsigned int group;             /* who to group with */
        void *gui_data;
+       int is_seconds;                 /* time value with seconds base */
+       int is_time;                    /* time based value */
+       int no_warn_def;
+       int pow2;                       /* must be a power-of-2 */
 };
 
 typedef int (str_cb_fn)(void *, char *);
@@ -87,10 +91,12 @@ 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_decimal(const char *, long long *, int, void *, int, int);
 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);
+extern int check_str_time(const char *p, long long *val, int);
+extern int str_to_float(const char *str, double *val, int is_time);
+
+extern int string_distance(const char *s1, const char *s2);
 
 /*
  * Handlers for the options
@@ -100,7 +106,7 @@ 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))
+#define __td_var(start, offset)        ((char *) start + (offset))
 
 struct thread_options;
 static inline void *td_var(struct thread_options *to, struct fio_option *o,