#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 get_mult_time(char c)
+static unsigned long long get_mult_time(const char *str, int len,
+ int is_seconds)
{
- switch (c) {
- case 'm':
- case 'M':
- return 60;
- case 'h':
- case 'H':
- return 60 * 60;
- case 'd':
- case 'D':
- return 24 * 60 * 60;
- default:
- return 1;
+ const char *p = str;
+ char *c;
+ unsigned long long mult = 1;
+
+ /*
+ * Go forward until we hit a non-digit, or +/- sign
+ */
+ while ((p - str) <= len) {
+ if (!isdigit((int) *p) && (*p != '+') && (*p != '-'))
+ break;
+ p++;
+ }
+
+ 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("us", c, 2) || !strncmp("usec", c, 4))
+ mult = 1;
+ 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 * 1000000UL;
+ else if (!strcmp("h", c))
+ mult = 60 * 60 * 1000000UL;
+ else if (!strcmp("d", c))
+ mult = 24 * 60 * 60 * 1000000UL;
+
+ free(c);
+ return mult;
}
static int is_separator(char c)
return __get_mult_bytes(p, data, percent);
}
+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.
*/
-int str_to_float(const char *str, double *val)
+int str_to_float(const char *str, double *val, int is_time)
{
- 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, is_time);
+ if (!rc) {
+ *val = dval;
+ return 1;
+ }
+ } else {
+ verify_exp_parser_float(str, 1.0, is_time);
+ }
+#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 is_time)
{
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, is_time);
+ 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 - 1]);
-
+ *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;
}
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, 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, 1);
}
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, 0)) {
*val = __val;
return 0;
}
return 1;
}
-static int opt_len(const char *str)
+static size_t opt_len(const char *str)
{
char *postfix;
return max(strlen(vp->ival), opt_len(str));
}
-#define val_store(ptr, val, off, or, data, o) \
- do { \
- if ((o)->prof_opts) \
- ptr = td_var((o)->prof_opts, (off)); \
- else \
- ptr = td_var((data), (off)); \
- if ((or)) \
- *ptr |= (val); \
- else \
- *ptr = (val); \
+#define val_store(ptr, val, off, or, data, o) \
+ do { \
+ ptr = td_var((data), (o), (off)); \
+ if ((or)) \
+ *ptr |= (val); \
+ else \
+ *ptr = (val); \
} while (0)
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
ret = 0;
if (o->off1)
- val_store(ilp, vp->oval, o->off1, vp->or, data, o);
+ val_store(ilp, vp->oval, o->off1, vp->orval, data, o);
continue;
}
}
fio_opt_str_val_fn *fn = o->cb;
char tmp[128], *p;
+ if (!is_time && o->is_time)
+ is_time = o->is_time;
+
strncpy(tmp, ptr, sizeof(tmp) - 1);
p = strchr(tmp, ',');
if (p)
*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);
*/
if (o->off2) {
ul2 = 0;
- if (o->prof_opts)
- ilp = td_var(o->prof_opts, o->off2);
- else
- ilp = td_var(data, o->off2);
+ ilp = td_var(data, o, o->off2);
*ilp = ul2;
}
- if (o->prof_opts)
- flp = td_var(o->prof_opts, o->off1);
- else
- flp = td_var(data, o->off1);
+ flp = td_var(data, o, o->off1);
for(i = 0; i < o->maxlen; i++)
flp[i].u.f = 0.0;
}
o->maxlen);
return 1;
}
- if (!str_to_float(ptr, &uf)) {
+ if (!str_to_float(ptr, &uf, 0)) { /* this breaks if we ever have lists of times */
log_err("not a floating point value: %s\n", ptr);
return 1;
}
return 1;
}
- if (o->prof_opts)
- flp = td_var(o->prof_opts, o->off1);
- else
- flp = td_var(data, o->off1);
+ flp = td_var(data, o, o->off1);
flp[curr].u.f = uf;
dprint(FD_PARSE, " out=%f\n", uf);
len++;
if (o->off2) {
- if (o->prof_opts)
- ilp = td_var(o->prof_opts, o->off2);
- else
- ilp = td_var(data, o->off2);
+ ilp = td_var(data, o, o->off2);
if (len > *ilp)
*ilp = len;
}
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
- if (o->off1) {
- if (o->prof_opts)
- cp = td_var(o->prof_opts, o->off1);
- else
- cp = td_var(data, o->off1);
+ 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))) {
* Option match, levenshtein distance. Handy for not quite remembering what
* the option name is.
*/
-static int string_distance(const char *s1, const char *s2)
+int string_distance(const char *s1, const char *s2)
{
unsigned int s1_len = strlen(s1);
unsigned int s2_len = strlen(s2);
q[0] = p[0] + 1;
for (j = 1; j <= s2_len; j++) {
unsigned int sub = p[j - 1];
+ unsigned int pmin;
if (s1[i - 1] != s2[j - 1])
sub++;
- q[j] = min(p[j] + 1, min(q[j - 1] + 1, sub));
+ pmin = min(q[j - 1] + 1, sub);
+ q[j] = min(p[j] + 1, pmin);
}
r = p;
p = q;
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);
}
if (o->type != FIO_OPT_STR_STORE || !o->off1)
continue;
- if (o->prof_opts)
- ptr = td_var(o->prof_opts, o->off1);
- else
- ptr = td_var(data, o->off1);
+ ptr = td_var(data, o, o->off1);
if (*ptr) {
free(*ptr);
*ptr = NULL;
projects / fio.git / blobdiff