Make parse.h C++ safe by avoiding "or" keyword

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 34d99d46d3e47d9b6c356d10aa6afeccf0eaadbf..5273d23f6907b41db030d0090ea555f87cf0ee61 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 */
 };
 
@@ -49,7 +49,6 @@ struct fio_option {
        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 */
@@ -69,6 +68,7 @@ struct fio_option {
        struct fio_option *inv_opt;     /* cached lookup */
        int (*verify)(struct fio_option *, void *);
        const char *prof_name;          /* only valid for specific profile */
+       void *prof_opts;
        unsigned int category;          /* what type of option */
        unsigned int group;             /* who to group with */
        void *gui_data;
@@ -100,7 +100,17 @@ 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)        ((void *) start + (offset))
+
+struct thread_options;
+static inline void *td_var(struct thread_options *to, struct fio_option *o,
+                          unsigned int offset)
+{
+       if (o->prof_opts)
+               return __td_var(o->prof_opts, offset);
+
+       return __td_var(to, offset);
+}
 
 static inline int parse_is_percent(unsigned long long val)
 {