summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-12-18 10:20:38 -0700
committerJens Axboe <axboe@fb.com>2014-12-18 10:20:38 -0700
commit83e16fe060881ec991fcf08e4d7a4f219e9f1d5e (patch)
tree0da2fe9f2cb78ec43a5a55672bd6138d5bf2890b
parent9ffad67af4d99ea271f8a0b55d854ecd93f7f8f1 (diff)
parent1d31d1bcffe0b282aaadca12dc83d2dd671b84f2 (diff)
downloadfio-83e16fe060881ec991fcf08e4d7a4f219e9f1d5e.tar.gz
fio-83e16fe060881ec991fcf08e4d7a4f219e9f1d5e.tar.bz2
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
-rw-r--r--parse.c53
1 files changed, 1 insertions, 52 deletions
diff --git a/parse.c b/parse.c
index ae87b1ed..e70ed20b 100644
--- a/parse.c
+++ b/parse.c
@@ -272,53 +272,6 @@ extern int evaluate_arithmetic_expression(const char *buffer, long long *ival,
double *dval, double implied_units,
int is_time);
-#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, int is_time)
-{
- long long ival;
- double dval, tmpval;
-
- if (sscanf(str, "%lf", &tmpval) != 1)
- return;
-
- if (evaluate_arithmetic_expression(str, &ival, &dval, implied_units, is_time) != 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 is_time)
-{
- 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, is_time);
- 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
-
/*
* Convert string into a floating number. Return 1 for success and 0 otherwise.
*/
@@ -335,8 +288,6 @@ int str_to_float(const char *str, double *val, int is_time)
*val = dval;
return 1;
}
- } else {
- verify_exp_parser_float(str, 1.0, is_time);
}
#endif
return 1 == sscanf(str, "%lf", val);
@@ -395,9 +346,7 @@ 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, is_time);
-#endif
+
return 0;
}