X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=3a5fbcc4bff557da86edc54f08a8a2abd8b20f07;hp=83c59f7026ca7e06b5371d59adfb2b0bd2d39b35;hb=c05ff64407845bb84e77e91113408d6baf6c030f;hpb=f75c69a1e26166b5c205c6d4c0a6a9412ee6cd86

diff --git a/parse.c b/parse.c
index 83c59f70..3a5fbcc4 100644
--- a/parse.c
+++ b/parse.c
@@ -18,6 +18,10 @@
 #include "minmax.h"
 #include "lib/ieee754.h"
 
+#ifdef CONFIG_ARITHMETIC
+#include "y.tab.h"
+#endif
+
 static struct fio_option *__fio_options;
 
 static int vp_cmp(const void *p1, const void *p2)
@@ -264,12 +268,72 @@ static unsigned long long get_mult_bytes(const char *str, int len, void *data,
 	return __get_mult_bytes(p, data, percent);
 }
 
+extern int evaluate_arithmetic_expression(const char *buffer, long long *ival,
+					  double *dval);
+
+#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)
+{
+	long long ival;
+	double dval, tmpval;
+
+	if (sscanf(str, "%lf", &tmpval) != 1)
+		return;
+
+	if (evaluate_arithmetic_expression(str, &ival, &dval) != 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;
+
+	rc = evaluate_arithmetic_expression(str, &ival, &dval);
+	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.
  */
 int str_to_float(const char *str, double *val)
 {
-	return (1 == sscanf(str, "%lf", val));
+#ifdef CONFIG_ARITHMETIC
+	int rc;
+	long long ival;
+	double dval;
+
+	if (str[0] == '(') {
+		rc = evaluate_arithmetic_expression(str, &ival, &dval);
+		if (!rc) {
+			*val = dval;
+			return 1;
+		}
+	} else {
+		verify_exp_parser_float(str);
+	}
+#endif
+	return 1 == sscanf(str, "%lf", val);
 }
 
 /*
@@ -279,19 +343,37 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data,
 		   int is_seconds)
 {
 	int len, base;
+	int rc = 1;
+#ifdef CONFIG_ARITHMETIC
+	long long ival;
+	double dval;
+#endif
 
 	len = strlen(str);
 	if (!len)
 		return 1;
 
-	if (strstr(str, "0x") || strstr(str, "0X"))
-		base = 16;
-	else
-		base = 10;
+#ifdef CONFIG_ARITHMETIC
+	if (str[0] == '(')
+		rc = evaluate_arithmetic_expression(str, &ival, &dval);
+	if (str[0] == '(' && !rc) {
+		if (!kilo && is_seconds)
+			*val = ival / 1000000LL;
+		else
+			*val = ival;
+	}
+#endif
 
-	*val = strtoll(str, NULL, base);
-	if (*val == LONG_MAX && errno == ERANGE)
-		return 1;
+	if (rc == 1) {
+		if (strstr(str, "0x") || strstr(str, "0X"))
+			base = 16;
+		else
+			base = 10;
+
+		*val = strtoll(str, NULL, base);
+		if (*val == LONG_MAX && errno == ERANGE)
+			return 1;
+	}
 
 	if (kilo) {
 		unsigned long long mult;
@@ -304,7 +386,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;
 }
 
@@ -380,7 +464,7 @@ static int check_int(const char *p, int *val)
 	return 1;
 }
 
-static int opt_len(const char *str)
+static size_t opt_len(const char *str)
 {
 	char *postfix;
 
@@ -624,7 +708,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			ret = 1;
 			for (i = 0; i < PARSE_MAX_VP; i++) {
 				vp = &posval[i];
-				if (!vp->ival || vp->ival[0] == '\0')
+				if (!vp->ival || vp->ival[0] == '\0' || !cp)
 					continue;
 				all_skipped = 0;
 				if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
@@ -1167,7 +1251,7 @@ void option_init(struct fio_option *o)
 		o->minfp = DBL_MIN;
 		o->maxfp = DBL_MAX;
 	}
-	if (o->type == FIO_OPT_STR_SET && o->def) {
+	if (o->type == FIO_OPT_STR_SET && o->def && !o->no_warn_def) {
 		log_err("Option %s: string set option with"
 				" default will always be true\n", o->name);
 	}