static void show_option_range(struct fio_option *o,
int (*logger)(const char *format, ...))
{
- if (o->type == FIO_OPT_FLOAT_LIST){
+ if (o->type == FIO_OPT_FLOAT_LIST) {
if (o->minfp == DBL_MIN && o->maxfp == DBL_MAX)
return;
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;
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)
/*
* 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;
else
*val *= mult;
} else
- *val *= get_mult_time(str[len - 1]);
+ *val *= get_mult_time(str, len, is_seconds);
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);
}
-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);
}
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 max(strlen(vp->ival), opt_len(str));
}
-#define val_store(ptr, val, off, or, data) \
+#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;
+ int il=0, *ilp;
fio_fp64_t *flp;
long long ull, *ullp;
long ul1, ul2;
all_skipped = 0;
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;
}
}
*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);
+ dprint(FD_PARSE, " ret=%d, out=%llu\n", ret, ull);
+
if (ret)
break;
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->roff2)
- *(unsigned int *) o->roff2 = ull;
- else if (o->off2)
- val_store(ilp, ull, o->off2, 0, data);
+ if (o->off2)
+ val_store(ilp, ull, o->off2, 0, data, o);
}
if (curr == 2) {
- if (o->roff3)
- *(unsigned int *) o->roff3 = ull;
- else if (o->off3)
- val_store(ilp, ull, o->off3, 0, data);
+ if (o->off3)
+ val_store(ilp, ull, o->off3, 0, data, o);
}
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 (o->off2)
+ val_store(ilp, ull, o->off2, 0, data, o);
}
if (curr < 2) {
- if (o->roff3)
- *(unsigned int *) o->roff3 = ull;
- else if (o->off3)
- val_store(ilp, ull, o->off3, 0, data);
+ 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);
}
}
}
** Initialize precision to 0 and zero out list
** in case specified list is shorter than default
*/
- ul2 = 0;
- ilp = td_var(data, o->off2);
- *ilp = ul2;
+ if (o->off2) {
+ ul2 = 0;
+ ilp = td_var(data, o, o->off2);
+ *ilp = ul2;
+ }
- 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;
}
return 1;
}
- 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);
+
/*
** Calculate precision for output by counting
** number of digits after period. Find first
while (*++cp2 != '\0' && *cp2 >= '0' && *cp2 <= '9')
len++;
- ilp = td_var(data, o->off2);
- if (len > *ilp)
- *ilp = 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;
- if (o->roff1 || o->off1) {
- if (o->roff1)
- cp = (char **) o->roff1;
- else if (o->off1)
- 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))) {
}
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->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 (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->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 (o->off5 && o->off6) {
+ val_store(ilp, ul1, o->off5, 0, data, o);
+ val_store(ilp, ul2, o->off6, 0, data, o);
}
}
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 (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->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 (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);
}
int parse_option(char *opt, const char *input,
- struct fio_option *options, struct fio_option **o, void *data)
+ struct fio_option *options, struct fio_option **o, void *data,
+ int dump_cmdline)
{
char *post;
return 1;
}
- if (!handle_option(*o, post, data))
- return 0;
+ if (handle_option(*o, post, data)) {
+ log_err("fio: failed parsing %s\n", input);
+ return 1;
+ }
- log_err("fio: failed parsing %s\n", input);
- return 1;
+ 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);
+ }
+
+ return 0;
}
/*
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->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("Options %s: no category defined. Setting to misc\n", o->name);
+ 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))) {
+ if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
log_err("Option %s: both cb and offset given\n", o->name);
- }
}
/*
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;
projects / fio.git / blobdiff