#include <limits.h>
#include <stdlib.h>
#include <math.h>
+#include <float.h>
#include "parse.h"
#include "debug.h"
#include "options.h"
+#include "minmax.h"
+#include "lib/ieee754.h"
+#include "lib/pow2.h"
-static struct fio_option *fio_options;
-extern unsigned int fio_get_kb_base(void *);
+#ifdef CONFIG_ARITHMETIC
+#include "y.tab.h"
+#endif
+
+static struct fio_option *__fio_options;
static int vp_cmp(const void *p1, const void *p2)
{
}
static void show_option_range(struct fio_option *o,
- int (*logger)(const char *format, ...))
+ size_t (*logger)(const char *format, ...))
{
- if (o->type == FIO_OPT_FLOAT_LIST){
- if (isnan(o->minfp) && isnan(o->maxfp))
+ if (o->type == FIO_OPT_FLOAT_LIST) {
+ if (o->minfp == DBL_MIN && o->maxfp == DBL_MAX)
return;
logger("%20s: min=%f", "range", o->minfp);
- if (!isnan(o->maxfp))
+ if (o->maxfp != DBL_MAX)
logger(", max=%f", o->maxfp);
logger("\n");
- } else {
+ } else if (!o->posval[0].ival) {
if (!o->minval && !o->maxval)
return;
"no argument (opt)",
"deprecated",
};
- int (*logger)(const char *format, ...);
+ size_t (*logger)(const char *format, ...);
if (is_err)
logger = log_err;
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)
+{
+ 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)
{
switch (c) {
- case 'm':
- case 'M':
- return 60;
- case 'h':
- case 'H':
- return 60 * 60;
- case 'd':
- case 'D':
- return 24 * 60 * 60;
- default:
+ case ':':
+ case '-':
+ case ',':
+ case '/':
return 1;
+ default:
+ return 0;
}
}
c = strdup(p);
- for (i = 0; i < strlen(c); i++)
+ for (i = 0; i < strlen(c); i++) {
c[i] = tolower(c[i]);
+ if (is_separator(c[i])) {
+ c[i] = '\0';
+ break;
+ }
+ }
- if (!strcmp("pib", c)) {
+ if (!strncmp("pib", c, 3)) {
pow = 5;
mult = 1000;
- } else if (!strcmp("tib", c)) {
+ } else if (!strncmp("tib", c, 3)) {
pow = 4;
mult = 1000;
- } else if (!strcmp("gib", c)) {
+ } else if (!strncmp("gib", c, 3)) {
pow = 3;
mult = 1000;
- } else if (!strcmp("mib", c)) {
+ } else if (!strncmp("mib", c, 3)) {
pow = 2;
mult = 1000;
- } else if (!strcmp("kib", c)) {
+ } else if (!strncmp("kib", c, 3)) {
pow = 1;
mult = 1000;
- } else if (!strcmp("p", c) || !strcmp("pb", c))
+ } else if (!strncmp("p", c, 1) || !strncmp("pb", c, 2))
pow = 5;
- else if (!strcmp("t", c) || !strcmp("tb", c))
+ else if (!strncmp("t", c, 1) || !strncmp("tb", c, 2))
pow = 4;
- else if (!strcmp("g", c) || !strcmp("gb", c))
+ else if (!strncmp("g", c, 1) || !strncmp("gb", c, 2))
pow = 3;
- else if (!strcmp("m", c) || !strcmp("mb", c))
+ else if (!strncmp("m", c, 1) || !strncmp("mb", c, 2))
pow = 2;
- else if (!strcmp("k", c) || !strcmp("kb", c))
+ else if (!strncmp("k", c, 1) || !strncmp("kb", c, 2))
pow = 1;
- else if (!strcmp("%", c)) {
+ else if (!strncmp("%", c, 1)) {
*percent = 1;
+ free(c);
return ret;
}
if (len < 2)
return __get_mult_bytes(str, data, percent);
- /*
- * Go forward until we hit a non-digit, or +/- sign
- */
+ /*
+ * Go forward until we hit a non-digit, or +/- sign
+ */
while ((p - str) <= len) {
if (!isdigit((int) *p) &&
(((*p != '+') && (*p != '-')) || digit_seen))
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);
+
/*
* 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;
+ }
+ }
+#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);
return 0;
}
-static int check_str_bytes(const char *p, long long *val, void *data)
+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);
}
-static 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)
{
char *s = *p;
+ if (!strlen(s))
+ return;
while (isspace((int) *s))
s++;
{
char *start = p, *s;
+ if (!strlen(p))
+ return;
+
s = strchr(p, ';');
if (s)
*s = '\0';
{
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 (int)(postfix - str);
}
-#define val_store(ptr, val, off, or, data) \
+static int str_match_len(const struct value_pair *vp, const char *str)
+{
+ return max(strlen(vp->ival), opt_len(str));
+}
+
+#define val_store(ptr, val, off, or, data, o) \
do { \
- ptr = td_var((data), (off)); \
+ ptr = td_var((data), (o), (off)); \
if ((or)) \
*ptr |= (val); \
else \
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
int first, int more, int curr)
{
- int il, *ilp;
- double* flp;
+ int il=0, *ilp;
+ fio_fp64_t *flp;
long long ull, *ullp;
long ul1, ul2;
double uf;
- char **cp;
+ char **cp = NULL;
int ret = 0, is_time = 0;
const struct value_pair *vp;
struct value_pair posval[PARSE_MAX_VP];
if (!vp->ival || vp->ival[0] == '\0')
continue;
all_skipped = 0;
- if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
+ if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
ret = 0;
- if (o->roff1) {
- if (vp->or)
- *(unsigned int *) o->roff1 |= vp->oval;
- else
- *(unsigned int *) o->roff1 = vp->oval;
- } else {
- if (!o->off1)
- continue;
- val_store(ilp, vp->oval, o->off1, vp->or, data);
- }
+ if (o->off1)
+ val_store(ilp, vp->oval, o->off1, vp->orval, data, o);
continue;
}
}
case FIO_OPT_INT:
case FIO_OPT_STR_VAL: {
fio_opt_str_val_fn *fn = o->cb;
+ char tmp[128], *p;
+
+ if (!is_time && o->is_time)
+ is_time = o->is_time;
+
+ tmp[sizeof(tmp) - 1] = '\0';
+ strncpy(tmp, ptr, sizeof(tmp) - 1);
+ p = strchr(tmp, ',');
+ if (p)
+ *p = '\0';
if (is_time)
- ret = check_str_time(ptr, &ull);
+ ret = check_str_time(tmp, &ull, o->is_seconds);
else
- ret = check_str_bytes(ptr, &ull, data);
+ ret = check_str_bytes(tmp, &ull, data);
+
+ dprint(FD_PARSE, " ret=%d, out=%llu\n", ret, ull);
if (ret)
break;
+ if (o->pow2 && !is_power_of_2(ull)) {
+ log_err("%s: must be a power-of-2\n", o->name);
+ return 1;
+ }
if (o->maxval && ull > o->maxval) {
- log_err("max value out of range: %lld"
- " (%d max)\n", ull, o->maxval);
+ log_err("max value out of range: %llu"
+ " (%u max)\n", ull, o->maxval);
return 1;
}
if (o->minval && ull < o->minval) {
- log_err("min value out of range: %lld"
- " (%d min)\n", ull, o->minval);
+ log_err("min value out of range: %llu"
+ " (%u min)\n", ull, o->minval);
return 1;
}
+ if (o->posval[0].ival) {
+ posval_sort(o, posval);
+
+ ret = 1;
+ for (i = 0; i < PARSE_MAX_VP; i++) {
+ vp = &posval[i];
+ if (!vp->ival || vp->ival[0] == '\0')
+ continue;
+ if (vp->oval == ull) {
+ ret = 0;
+ break;
+ }
+ }
+ if (ret) {
+ log_err("fio: value %llu not allowed:\n", ull);
+ show_option_values(o);
+ return 1;
+ }
+ }
if (fn)
ret = fn(data, &ull);
else {
if (o->type == FIO_OPT_INT) {
- if (first) {
- if (o->roff1)
- *(unsigned int *) o->roff1 = ull;
- else
- val_store(ilp, ull, o->off1, 0, data);
+ if (first)
+ val_store(ilp, ull, o->off1, 0, data, o);
+ if (curr == 1) {
+ if (o->off2)
+ val_store(ilp, ull, o->off2, 0, data, o);
+ }
+ if (curr == 2) {
+ if (o->off3)
+ val_store(ilp, ull, o->off3, 0, data, o);
}
if (!more) {
- if (o->roff2)
- *(unsigned int *) o->roff2 = ull;
- else if (o->off2)
- val_store(ilp, ull, o->off2, 0, data);
+ if (curr < 1) {
+ if (o->off2)
+ val_store(ilp, ull, o->off2, 0, data, o);
+ }
+ if (curr < 2) {
+ if (o->off3)
+ val_store(ilp, ull, o->off3, 0, data, o);
+ }
}
} else {
- if (first) {
- if (o->roff1)
- *(unsigned long long *) o->roff1 = ull;
- else
- val_store(ullp, ull, o->off1, 0, data);
- }
+ if (first)
+ val_store(ullp, ull, o->off1, 0, data, o);
if (!more) {
- if (o->roff2)
- *(unsigned long long *) o->roff2 = ull;
- else if (o->off2)
- val_store(ullp, ull, o->off2, 0, data);
+ if (o->off2)
+ val_store(ullp, ull, o->off2, 0, data, o);
}
}
}
break;
}
case FIO_OPT_FLOAT_LIST: {
+ char *cp2;
if (first) {
- ul2 = 1;
- ilp = td_var(data, o->off2);
- *ilp = ul2;
+ /*
+ ** Initialize precision to 0 and zero out list
+ ** in case specified list is shorter than default
+ */
+ if (o->off2) {
+ ul2 = 0;
+ ilp = td_var(data, o, o->off2);
+ *ilp = ul2;
+ }
+
+ flp = td_var(data, o, o->off1);
+ for(i = 0; i < o->maxlen; i++)
+ flp[i].u.f = 0.0;
}
if (curr >= o->maxlen) {
log_err("the list exceeding max length %d\n",
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;
}
- if (!isnan(o->maxfp) && uf > o->maxfp) {
+ if (uf > o->maxfp) {
log_err("value out of range: %f"
" (range max: %f)\n", uf, o->maxfp);
return 1;
}
- if (!isnan(o->minfp) && uf < o->minfp) {
+ if (uf < o->minfp) {
log_err("value out of range: %f"
" (range min: %f)\n", uf, o->minfp);
return 1;
}
- flp = td_var(data, o->off1);
- flp[curr] = uf;
+ flp = td_var(data, o, o->off1);
+ flp[curr].u.f = uf;
+
+ dprint(FD_PARSE, " out=%f\n", uf);
+
+ /*
+ ** Calculate precision for output by counting
+ ** number of digits after period. Find first
+ ** period in entire remaining list each time
+ */
+ cp2 = strchr(ptr, '.');
+ if (cp2 != NULL) {
+ int len = 0;
+
+ while (*++cp2 != '\0' && *cp2 >= '0' && *cp2 <= '9')
+ len++;
+
+ if (o->off2) {
+ ilp = td_var(data, o, o->off2);
+ if (len > *ilp)
+ *ilp = len;
+ }
+ }
break;
}
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
- posval_sort(o, posval);
+ if (!strlen(ptr))
+ return 1;
- if (!o->posval[0].ival) {
- vp = NULL;
- goto match;
+ 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')
- continue;
- all_skipped = 0;
- if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
- char *rest;
+ if (fn)
+ ret = fn(data, ptr);
+ else if (o->posval[0].ival) {
+ posval_sort(o, posval);
- ret = 0;
- if (vp->cb)
- fn = vp->cb;
-match:
- if (o->roff1)
- cp = (char **) o->roff1;
- else
- cp = td_var(data, o->off1);
- *cp = strdup(ptr);
- rest = strstr(*cp, ":");
- if (rest) {
- *rest = '\0';
- ptr = rest + 1;
- } else if (vp && vp->cb)
- ptr = NULL;
- break;
+ ret = 1;
+ for (i = 0; i < PARSE_MAX_VP; i++) {
+ vp = &posval[i];
+ if (!vp->ival || vp->ival[0] == '\0' || !cp)
+ continue;
+ all_skipped = 0;
+ if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
+ char *rest;
+
+ ret = 0;
+ if (vp->cb)
+ fn = vp->cb;
+ rest = strstr(*cp ?: ptr, ":");
+ if (rest) {
+ if (*cp)
+ *rest = '\0';
+ ptr = rest + 1;
+ } else
+ ptr = NULL;
+ break;
+ }
}
}
- if (ret && !all_skipped)
- show_option_values(o);
- else if (fn && ptr)
- ret = fn(data, ptr);
+ if (!all_skipped) {
+ if (ret && !*cp)
+ show_option_values(o);
+ else if (ret && *cp)
+ ret = 0;
+ else if (fn && ptr)
+ ret = fn(data, ptr);
+ }
break;
}
char tmp[128];
char *p1, *p2;
+ tmp[sizeof(tmp) - 1] = '\0';
strncpy(tmp, ptr, sizeof(tmp) - 1);
/* Handle bsrange with separate read,write values: */
}
if (first) {
- if (o->roff1)
- *(unsigned int *) o->roff1 = ul1;
- else
- val_store(ilp, ul1, o->off1, 0, data);
- if (o->roff2)
- *(unsigned int *) o->roff2 = ul2;
- else
- val_store(ilp, ul2, o->off2, 0, data);
+ val_store(ilp, ul1, o->off1, 0, data, o);
+ val_store(ilp, ul2, o->off2, 0, data, o);
+ }
+ if (curr == 1) {
+ if (o->off3 && o->off4) {
+ val_store(ilp, ul1, o->off3, 0, data, o);
+ val_store(ilp, ul2, o->off4, 0, data, o);
+ }
+ }
+ if (curr == 2) {
+ if (o->off5 && o->off6) {
+ val_store(ilp, ul1, o->off5, 0, data, o);
+ val_store(ilp, ul2, o->off6, 0, data, o);
+ }
}
- if (o->roff3 && o->roff4) {
- *(unsigned int *) o->roff3 = ul1;
- *(unsigned int *) o->roff4 = ul2;
- } else if (o->off3 && o->off4) {
- val_store(ilp, ul1, o->off3, 0, data);
- val_store(ilp, ul2, o->off4, 0, data);
+ if (!more) {
+ if (curr < 1) {
+ if (o->off3 && o->off4) {
+ val_store(ilp, ul1, o->off3, 0, data, o);
+ val_store(ilp, ul2, o->off4, 0, data, o);
+ }
+ }
+ if (curr < 2) {
+ if (o->off5 && o->off6) {
+ val_store(ilp, ul1, o->off5, 0, data, o);
+ val_store(ilp, ul2, o->off6, 0, data, o);
+ }
+ }
}
}
else
il = 1;
+ dprint(FD_PARSE, " ret=%d, out=%d\n", ret, il);
+
if (ret)
break;
if (fn)
ret = fn(data, &il);
else {
- if (first) {
- if (o->roff1)
- *(unsigned int *)o->roff1 = il;
- else
- val_store(ilp, il, o->off1, 0, data);
- }
+ if (first)
+ val_store(ilp, il, o->off1, 0, data, o);
if (!more) {
- if (o->roff2)
- *(unsigned int *) o->roff2 = il;
- else if (o->off2)
- val_store(ilp, il, o->off2, 0, data);
+ if (o->off2)
+ val_store(ilp, il, o->off2, 0, data, o);
}
}
break;
}
case FIO_OPT_DEPRECATED:
log_info("Option %s is deprecated\n", o->name);
+ ret = 1;
break;
default:
log_err("Bad option type %u\n", o->type);
ptr2 = strchr(ptr, ',');
if (ptr2 && *(ptr2 + 1) == '\0')
*ptr2 = '\0';
- if (o->type != FIO_OPT_STR_MULTI) {
+ if (o->type != FIO_OPT_STR_MULTI && o->type != FIO_OPT_RANGE) {
if (!ptr2)
ptr2 = strchr(ptr, ':');
if (!ptr2)
return ret;
}
-static struct fio_option *get_option(const char *opt,
+static struct fio_option *get_option(char *opt,
struct fio_option *options, char **post)
{
struct fio_option *o;
if (ret) {
*post = ret;
*ret = '\0';
- ret = (char *) opt;
+ ret = opt;
(*post)++;
strip_blank_end(ret);
o = find_option(options, ret);
static int opt_cmp(const void *p1, const void *p2)
{
- struct fio_option *o1, *o2;
- char *s1, *s2, *foo;
+ struct fio_option *o;
+ char *s, *foo;
int prio1, prio2;
- s1 = strdup(*((char **) p1));
- s2 = strdup(*((char **) p2));
-
- o1 = get_option(s1, fio_options, &foo);
- o2 = get_option(s2, fio_options, &foo);
-
prio1 = prio2 = 0;
- if (o1)
- prio1 = o1->prio;
- if (o2)
- prio2 = o2->prio;
- free(s1);
- free(s2);
+ if (*(char **)p1) {
+ s = strdup(*((char **) p1));
+ o = get_option(s, __fio_options, &foo);
+ if (o)
+ prio1 = o->prio;
+ free(s);
+ }
+ if (*(char **)p2) {
+ s = strdup(*((char **) p2));
+ o = get_option(s, __fio_options, &foo);
+ if (o)
+ prio2 = o->prio;
+ free(s);
+ }
+
return prio2 - prio1;
}
void sort_options(char **opts, struct fio_option *options, int num_opts)
{
- fio_options = options;
+ __fio_options = options;
qsort(opts, num_opts, sizeof(char *), opt_cmp);
- fio_options = NULL;
+ __fio_options = NULL;
}
int parse_cmd_option(const char *opt, const char *val,
return 1;
}
-/*
- * Return a copy of the input string with substrings of the form ${VARNAME}
- * substituted with the value of the environment variable VARNAME. The
- * substitution always occurs, even if VARNAME is empty or the corresponding
- * environment variable undefined.
- */
-static char *option_dup_subs(const char *opt)
+int parse_option(char *opt, const char *input,
+ struct fio_option *options, struct fio_option **o, void *data,
+ int dump_cmdline)
{
- char out[OPT_LEN_MAX+1];
- char in[OPT_LEN_MAX+1];
- char *outptr = out;
- char *inptr = in;
- char *ch1, *ch2, *env;
- ssize_t nchr = OPT_LEN_MAX;
- size_t envlen;
-
- if (strlen(opt) + 1 > OPT_LEN_MAX) {
- log_err("OPT_LEN_MAX (%d) is too small\n", OPT_LEN_MAX);
- return NULL;
- }
-
- in[OPT_LEN_MAX] = '\0';
- strncpy(in, opt, OPT_LEN_MAX);
-
- while (*inptr && nchr > 0) {
- if (inptr[0] == '$' && inptr[1] == '{') {
- ch2 = strchr(inptr, '}');
- if (ch2 && inptr+1 < ch2) {
- ch1 = inptr+2;
- inptr = ch2+1;
- *ch2 = '\0';
-
- env = getenv(ch1);
- if (env) {
- envlen = strlen(env);
- if (envlen <= nchr) {
- memcpy(outptr, env, envlen);
- outptr += envlen;
- nchr -= envlen;
- }
- }
-
- continue;
- }
- }
+ char *post;
- *outptr++ = *inptr++;
- --nchr;
+ if (!opt) {
+ log_err("fio: failed parsing %s\n", input);
+ *o = NULL;
+ return 1;
}
- *outptr = '\0';
- return strdup(out);
-}
-
-int parse_option(const char *opt, struct fio_option *options, void *data)
-{
- struct fio_option *o;
- char *post, *tmp;
-
- tmp = option_dup_subs(opt);
- if (!tmp)
+ *o = get_option(opt, options, &post);
+ if (!*o) {
+ if (post) {
+ int len = strlen(opt);
+ if (opt + len + 1 != post)
+ memmove(opt + len + 1, post, strlen(post));
+ opt[len] = '=';
+ }
return 1;
+ }
- o = get_option(tmp, options, &post);
- if (!o) {
- log_err("Bad option <%s>\n", tmp);
- free(tmp);
+ if (handle_option(*o, post, data)) {
+ log_err("fio: failed parsing %s\n", input);
return 1;
}
- if (!handle_option(o, post, data)) {
- free(tmp);
- return 0;
+ if (dump_cmdline) {
+ const char *delim;
+
+ if (!strcmp("description", (*o)->name))
+ delim = "\"";
+ else
+ delim = "";
+
+ log_info("--%s%s", (*o)->name, post ? "" : " ");
+ if (post)
+ log_info("=%s%s%s ", delim, post, delim);
}
- log_err("fio: failed parsing %s\n", opt);
- free(tmp);
- return 1;
+ return 0;
}
/*
* 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;
return i;
}
+/*
+ * Make a guess of whether the distance from 's1' is significant enough
+ * to warrant printing the guess. We set this to a 1/2 match.
+ */
+int string_distance_ok(const char *opt, int distance)
+{
+ size_t len;
+
+ len = strlen(opt);
+ len = (len + 1) / 2;
+ return distance <= len;
+}
+
static struct fio_option *find_child(struct fio_option *options,
struct fio_option *o)
{
continue;
if (!exec_profile && o->prof_name)
continue;
+ if (exec_profile && !(o->prof_name && !strcmp(exec_profile, o->prof_name)))
+ continue;
if (name) {
if (!strcmp(name, o->name) ||
o->minval = 0;
o->maxval = 1;
}
+ if (o->type == FIO_OPT_INT) {
+ if (!o->maxval)
+ o->maxval = UINT_MAX;
+ }
if (o->type == FIO_OPT_FLOAT_LIST) {
- o->minfp = NAN;
- o->maxfp = NAN;
+ 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->cb && (!o->off1 && !o->roff1))
+ if (!o->cb && !o->off1)
log_err("Option %s: neither cb nor offset given\n", o->name);
+ if (!o->category) {
+ log_info("Option %s: no category defined. Setting to misc\n", o->name);
+ o->category = FIO_OPT_C_GENERAL;
+ o->group = FIO_OPT_G_INVALID;
+ }
if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
o->type == FIO_OPT_STR_MULTI)
return;
- if (o->cb && ((o->off1 || o->off2 || o->off3 || o->off4) ||
- (o->roff1 || o->roff2 || o->roff3 || o->roff4))) {
- log_err("Option %s: both cb and offset given\n", o->name);
- }
}
/*
dprint(FD_PARSE, "init options\n");
- for (o = &options[0]; o->name; o++)
+ for (o = &options[0]; o->name; o++) {
option_init(o);
+ if (o->inverse)
+ o->inv_opt = find_option(options, o->inverse);
+ }
}
void options_free(struct fio_option *options, void *data)
dprint(FD_PARSE, "free options\n");
for (o = &options[0]; o->name; o++) {
- if (o->type != FIO_OPT_STR_STORE)
+ if (o->type != FIO_OPT_STR_STORE || !o->off1)
continue;
- ptr = td_var(data, o->off1);
+ ptr = td_var(data, o, o->off1);
if (*ptr) {
free(*ptr);
*ptr = NULL;