Merge branch 'master' of https://github.com/bvanassche/fio

[fio.git] / parse.h

diff --git a/parse.h b/parse.h
index 9b4e2f32535cbd8c31bbc4f059dd1f76b76a25fc..d68484eaf0c65572352222297162ebd0d20cf7e7 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -21,6 +21,7 @@ enum fio_opt_type {
        FIO_OPT_BOOL,
        FIO_OPT_FLOAT_LIST,
        FIO_OPT_STR_SET,
+       FIO_OPT_STR_VAL_ZONE,
        FIO_OPT_DEPRECATED,
        FIO_OPT_SOFT_DEPRECATED,
        FIO_OPT_UNSUPPORTED,    /* keep this last */
@@ -38,7 +39,7 @@ struct value_pair {
 };
 
 #define OPT_LEN_MAX    8192
-#define PARSE_MAX_VP   24
+#define PARSE_MAX_VP   32
 
 /*
  * Option define
@@ -125,12 +126,23 @@ static inline void *td_var(void *to, const struct fio_option *o,
        else
                ret = to;
 
-       return ret + offset;
+       return (void *) ((uintptr_t) ret + offset);
 }
 
 static inline int parse_is_percent(unsigned long long val)
 {
-       return val <= -1ULL && val >= (-1ULL - 100ULL);
+       return val >= -101ULL;
+}
+
+#define ZONE_BASE_VAL ((-1ULL >> 1) + 1)
+static inline int parse_is_percent_uncapped(unsigned long long val)
+{
+       return ZONE_BASE_VAL + -1U < val;
+}
+
+static inline int parse_is_zone(unsigned long long val)
+{
+       return (val - ZONE_BASE_VAL) <= -1U;
 }
 
 struct print_option {