#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)
show_option_values(o);
}
-static unsigned long long get_mult_time(const char *str, int len)
+static unsigned long long get_mult_time(const char *str, int len,
+ int is_seconds)
{
const char *p = str;
char *c;
- unsigned long long mult = 1000;
+ unsigned long long mult = 1;
/*
* Go forward until we hit a non-digit, or +/- sign
p++;
}
- if (!isalpha((int) *p))
- return 1000;
+ if (!isalpha((int) *p)) {
+ if (is_seconds)
+ return 1000000UL;
+ else
+ return 1;
+ }
c = strdup(p);
for (int i = 0; i < strlen(c); i++)
c[i] = tolower(c[i]);
- if (!strncmp("ms", c, 2))
+ if (!strncmp("us", c, 2) || !strncmp("usec", c, 4))
mult = 1;
- else if (!strcmp("s", c))
+ else if (!strncmp("ms", c, 2) || !strncmp("msec", c, 4))
mult = 1000;
+ else if (!strcmp("s", c))
+ mult = 1000000;
else if (!strcmp("m", c))
- mult = 60 * 1000;
+ mult = 60 * 1000000UL;
else if (!strcmp("h", c))
- mult = 60 * 60 * 1000;
+ mult = 60 * 60 * 1000000UL;
else if (!strcmp("d", c))
- mult = 24 * 60 * 60 * 1000;
+ mult = 24 * 60 * 60 * 1000000UL;
free(c);
return mult;
return __get_mult_bytes(p, data, percent);
}
+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
+
/*
* 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, 1.0);
+ if (!rc) {
+ *val = dval;
+ return 1;
+ }
+ } else {
+ verify_exp_parser_float(str, 1.0);
+ }
+#endif
+ return 1 == sscanf(str, "%lf", 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 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;
+ double implied_units = 1.0;
+#endif
len = strlen(str);
if (!len)
return 1;
- if (strstr(str, "0x") || strstr(str, "0X"))
- base = 16;
- else
- base = 10;
+#ifdef CONFIG_ARITHMETIC
+ if (is_seconds)
+ implied_units = 1000000.0;
+ if (str[0] == '(')
+ rc = evaluate_arithmetic_expression(str, &ival, &dval, implied_units);
+ 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;
else
*val *= mult;
} else
- *val *= get_mult_time(str, len);
-
+ *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);
+ return str_to_decimal(p, val, 1, data, 0);
}
-int check_str_time(const char *p, long long *val)
+int check_str_time(const char *p, long long *val, int is_seconds)
{
- return str_to_decimal(p, val, 0, NULL);
+ return str_to_decimal(p, val, 0, NULL, is_seconds);
}
void strip_blank_front(char **p)
{
long long __val;
- if (!str_to_decimal(str, &__val, 1, data)) {
+ if (!str_to_decimal(str, &__val, 1, data, 0)) {
*val = __val;
return 0;
}
return 1;
}
-static int opt_len(const char *str)
+static size_t opt_len(const char *str)
{
char *postfix;
*p = '\0';
if (is_time)
- ret = check_str_time(tmp, &ull);
+ ret = check_str_time(tmp, &ull, o->is_seconds);
else
ret = check_str_bytes(tmp, &ull, data);
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
+ if (!strlen(ptr))
+ return 1;
+
if (o->off1) {
cp = td_var(data, o, o->off1);
*cp = strdup(ptr);
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))) {
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);
}
projects / fio.git / blobdiff