X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=9e31908aebf41bf17ba69fbcfb68947839099cd7;hp=b632bf1adc10dfbeb580c17776a15095400fc90a;hb=d36b072de874db57b585993c6c3b475f34ecad58;hpb=96106472fa3a9fb161b1114673da80eff23a36a3

diff --git a/parse.c b/parse.c
index b632bf1a..9e31908a 100644
--- a/parse.c
+++ b/parse.c
@@ -269,7 +269,53 @@ 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 *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
 
 /*
  * Convert string into a floating number. Return 1 for success and 0 otherwise.
@@ -282,11 +328,13 @@ int str_to_float(const char *str, double *val)
 	double dval;
 
 	if (str[0] == '(') {
-		rc = evaluate_arithmetic_expression(str, &ival, &dval);
+		rc = evaluate_arithmetic_expression(str, &ival, &dval, 1.0);
 		if (!rc) {
 			*val = dval;
 			return 1;
 		}
+	} else {
+		verify_exp_parser_float(str, 1.0);
 	}
 #endif
 	return 1 == sscanf(str, "%lf", val);
@@ -303,6 +351,7 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data,
 #ifdef CONFIG_ARITHMETIC
 	long long ival;
 	double dval;
+	double implied_units = 1.0;
 #endif
 
 	len = strlen(str);
@@ -310,8 +359,10 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data,
 		return 1;
 
 #ifdef CONFIG_ARITHMETIC
+	if (is_seconds)
+		implied_units = 1000000.0;
 	if (str[0] == '(')
-		rc = evaluate_arithmetic_expression(str, &ival, &dval);
+		rc = evaluate_arithmetic_expression(str, &ival, &dval, implied_units);
 	if (str[0] == '(' && !rc) {
 		if (!kilo && is_seconds)
 			*val = ival / 1000000LL;
@@ -342,7 +393,9 @@ 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;
 }