#include <limits.h>
#include <stdlib.h>
#include <math.h>
+#include <values.h>
#include "parse.h"
#include "debug.h"
#include "options.h"
+#include "minmax.h"
+#include "lib/ieee754.h"
static struct fio_option *fio_options;
extern unsigned int fio_get_kb_base(void *);
int (*logger)(const char *format, ...))
{
if (o->type == FIO_OPT_FLOAT_LIST){
- if (isnan(o->minfp) && isnan(o->maxfp))
+ if (o->minfp == MINDOUBLE && o->maxfp == MAXDOUBLE)
return;
logger("%20s: min=%f", "range", o->minfp);
- if (!isnan(o->maxfp))
+ if (o->maxfp != MAXDOUBLE)
logger(", max=%f", o->maxfp);
logger("\n");
} else {
pow = 1;
else if (!strcmp("%", c)) {
*percent = 1;
+ free(c);
return ret;
}
return (int)(postfix - str);
}
+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) \
do { \
ptr = td_var((data), (off)); \
int first, int more, int curr)
{
int il, *ilp;
- double* flp;
+ 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)
case FIO_OPT_INT:
case FIO_OPT_STR_VAL: {
fio_opt_str_val_fn *fn = o->cb;
+ char tmp[128], *p;
+
+ 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);
else
- ret = check_str_bytes(ptr, &ull, data);
+ ret = check_str_bytes(tmp, &ull, data);
if (ret)
break;
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;
}
else
val_store(ilp, ull, o->off1, 0, data);
}
- if (!more) {
+ if (curr == 1) {
if (o->roff2)
*(unsigned int *) o->roff2 = ull;
else if (o->off2)
val_store(ilp, ull, o->off2, 0, data);
}
+ if (curr == 2) {
+ if (o->roff3)
+ *(unsigned int *) o->roff3 = ull;
+ else if (o->off3)
+ val_store(ilp, ull, o->off3, 0, data);
+ }
+ if (!more) {
+ if (curr < 1) {
+ if (o->roff2)
+ *(unsigned int *) o->roff2 = ull;
+ else if (o->off2)
+ val_store(ilp, ull, o->off2, 0, data);
+ }
+ if (curr < 2) {
+ if (o->roff3)
+ *(unsigned int *) o->roff3 = ull;
+ else if (o->off3)
+ val_store(ilp, ull, o->off3, 0, data);
+ }
+ }
} else {
if (first) {
if (o->roff1)
break;
}
case FIO_OPT_FLOAT_LIST: {
-
- if (first) {
- ul2 = 1;
- ilp = td_var(data, o->off2);
- *ilp = ul2;
- }
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)){
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[curr].u.f = uf;
break;
}
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
- posval_sort(o, posval);
+ if (o->roff1 || o->off1) {
+ if (o->roff1)
+ cp = (char **) o->roff1;
+ else if (o->off1)
+ cp = td_var(data, o->off1);
- if ((o->roff1 || o->off1) && !o->posval[0].ival) {
- vp = NULL;
- goto match;
+ *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')
+ 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;
}
else
val_store(ilp, ul2, o->off2, 0, data);
}
- 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 (curr == 1) {
+ 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 (curr == 2) {
+ if (o->roff5 && o->roff6) {
+ *(unsigned int *) o->roff5 = ul1;
+ *(unsigned int *) o->roff6 = ul2;
+ } else if (o->off5 && o->off6) {
+ val_store(ilp, ul1, o->off5, 0, data);
+ val_store(ilp, ul2, o->off6, 0, data);
+ }
+ }
+ if (!more) {
+ if (curr < 1) {
+ 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 (curr < 2) {
+ if (o->roff5 && o->roff6) {
+ *(unsigned int *) o->roff5 = ul1;
+ *(unsigned int *) o->roff6 = ul2;
+ } else if (o->off5 && o->off6) {
+ val_store(ilp, ul1, o->off5, 0, data);
+ val_store(ilp, ul2, o->off6, 0, data);
+ }
+ }
}
}
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)
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 = MINDOUBLE;
+ o->maxfp = MAXDOUBLE;
}
if (o->type == FIO_OPT_STR_SET && o->def) {
log_err("Option %s: string set option with"
projects / fio.git / blobdiff