fio: support suffixes in expression parser

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index c2d1cc811f6740a58bf0692a5c9f740e1d085aae..b632bf1adc10dfbeb580c17776a15095400fc90a 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -312,8 +312,12 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data,
 #ifdef CONFIG_ARITHMETIC
        if (str[0] == '(')
                rc = evaluate_arithmetic_expression(str, &ival, &dval);
-       if (str[0] == '(' && !rc)
-               *val = ival;
+       if (str[0] == '(' && !rc) {
+               if (!kilo && is_seconds)
+                       *val = ival / 1000000LL;
+               else
+                       *val = ival;
+       }
 #endif
 
        if (rc == 1) {