Add support for options being a power-of-2

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 282baa4c154554b7f537e25f0d723a70dc4df6ea..745056bdc8186e54743d2fb688df926084c91853 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -17,6 +17,7 @@
 #include "options.h"
 #include "minmax.h"
 #include "lib/ieee754.h"
+#include "lib/pow2.h"
 
 #ifdef CONFIG_ARITHMETIC
 #include "y.tab.h"
@@ -269,58 +270,13 @@ static unsigned long long get_mult_bytes(const char *str, int len, void *data,
 }
 
 extern int evaluate_arithmetic_expression(const char *buffer, long long *ival,
-                                         double *dval, double implied_units);
-
-#ifdef CONFIG_ARITHMETIC
-/*
- * These two verification functions are just to gain confidence that
- * the arithmetic processing code is always getting the same answer as the
- * original number parsing code.  Once sufficiently sure that the arithmetic
- * code is always getting the right answers, these can be removed.
- */
-static void verify_exp_parser_float(const char *str, double implied_units)
-{
-       long long ival;
-       double dval, tmpval;
-
-       if (sscanf(str, "%lf", &tmpval) != 1)
-               return;
-
-       if (evaluate_arithmetic_expression(str, &ival, &dval, implied_units) != 0) {
-               log_info("Arithmetic failed on '%s'\n", str);
-               return;
-       }
-       if (dval != tmpval) {
-               log_info("Arithmetic failed on: '%s' got %lf, expected %lf\n",
-                               str, dval, tmpval);
-       }
-}
-
-static void verify_exp_parser_decimal(const char *str, long long val, int kilo, int is_seconds)
-{
-       int rc;
-       long long ival;
-       double dval;
-       double implied_units = 1.0;
-
-       if (is_seconds)
-               implied_units = 1000000.0;
-
-       rc = evaluate_arithmetic_expression(str, &ival, &dval, implied_units);
-       if (!rc) {
-               if (ival != val)
-                       log_info("Arithmetic failed on '%s', expected %lld, got %lld\n",
-                               str, val, ival);
-       } else {
-               log_info("Arithmetic failed on '%s'\n", str);
-       }
-}
-#endif
+                                         double *dval, double implied_units,
+                                         int is_time);
 
 /*
  * Convert string into a floating number. Return 1 for success and 0 otherwise.
  */
-int str_to_float(const char *str, double *val)
+int str_to_float(const char *str, double *val, int is_time)
 {
 #ifdef CONFIG_ARITHMETIC
        int rc;
@@ -328,13 +284,11 @@ int str_to_float(const char *str, double *val)
        double dval;
 
        if (str[0] == '(') {
-               rc = evaluate_arithmetic_expression(str, &ival, &dval, 1.0);
+               rc = evaluate_arithmetic_expression(str, &ival, &dval, 1.0, is_time);
                if (!rc) {
                        *val = dval;
                        return 1;
                }
-       } else {
-               verify_exp_parser_float(str, 1.0);
        }
 #endif
        return 1 == sscanf(str, "%lf", val);
@@ -344,7 +298,7 @@ int str_to_float(const char *str, double *val)
  * convert string into decimal value, noting any size suffix
  */
 int str_to_decimal(const char *str, long long *val, int kilo, void *data,
-                  int is_seconds)
+                  int is_seconds, int is_time)
 {
        int len, base;
        int rc = 1;
@@ -362,7 +316,7 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data,
        if (is_seconds)
                implied_units = 1000000.0;
        if (str[0] == '(')
-               rc = evaluate_arithmetic_expression(str, &ival, &dval, implied_units);
+               rc = evaluate_arithmetic_expression(str, &ival, &dval, implied_units, is_time);
        if (str[0] == '(' && !rc) {
                if (!kilo && is_seconds)
                        *val = ival / 1000000LL;
@@ -393,20 +347,18 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data,
                        *val *= mult;
        } else
                *val *= get_mult_time(str, len, is_seconds);
-#ifdef CONFIG_ARITHMETIC
-       verify_exp_parser_decimal(str, *val, kilo, is_seconds);
-#endif
+
        return 0;
 }
 
 int check_str_bytes(const char *p, long long *val, void *data)
 {
-       return str_to_decimal(p, val, 1, data, 0);
+       return str_to_decimal(p, val, 1, data, 0, 0);
 }
 
 int check_str_time(const char *p, long long *val, int is_seconds)
 {
-       return str_to_decimal(p, val, 0, NULL, is_seconds);
+       return str_to_decimal(p, val, 0, NULL, is_seconds, 1);
 }
 
 void strip_blank_front(char **p)
@@ -448,7 +400,7 @@ static int check_range_bytes(const char *str, long *val, void *data)
 {
        long long __val;
 
-       if (!str_to_decimal(str, &__val, 1, data, 0)) {
+       if (!str_to_decimal(str, &__val, 1, data, 0, 0)) {
                *val = __val;
                return 0;
        }
@@ -552,6 +504,10 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                fio_opt_str_val_fn *fn = o->cb;
                char tmp[128], *p;
 
+               if (!is_time && o->is_time)
+                       is_time = o->is_time;
+
+               tmp[sizeof(tmp) - 1] = '\0';
                strncpy(tmp, ptr, sizeof(tmp) - 1);
                p = strchr(tmp, ',');
                if (p)
@@ -566,6 +522,10 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
                if (ret)
                        break;
+               if (o->pow2 && !is_power_of_2(ull)) {
+                       log_err("%s: must be a power-of-2\n", o->name);
+                       return 1;
+               }
 
                if (o->maxval && ull > o->maxval) {
                        log_err("max value out of range: %llu"
@@ -655,7 +615,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                        o->maxlen);
                        return 1;
                }
-               if (!str_to_float(ptr, &uf)) {
+               if (!str_to_float(ptr, &uf, 0)) { /* this breaks if we ever have lists of times */
                        log_err("not a floating point value: %s\n", ptr);
                        return 1;
                }
@@ -751,6 +711,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                char tmp[128];
                char *p1, *p2;
 
+               tmp[sizeof(tmp) - 1] = '\0';
                strncpy(tmp, ptr, sizeof(tmp) - 1);
 
                /* Handle bsrange with separate read,write values: */
@@ -1063,7 +1024,7 @@ int parse_option(char *opt, const char *input,
  * Option match, levenshtein distance. Handy for not quite remembering what
  * the option name is.
  */
-static int string_distance(const char *s1, const char *s2)
+int string_distance(const char *s1, const char *s2)
 {
        unsigned int s1_len = strlen(s1);
        unsigned int s2_len = strlen(s2);
@@ -1274,8 +1235,6 @@ void option_init(struct fio_option *o)
        if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
            o->type == FIO_OPT_STR_MULTI)
                return;
-       if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
-               log_err("Option %s: both cb and offset given\n", o->name);
 }
 
 /*