#include <errno.h>
#include <limits.h>
#include <stdlib.h>
+#include <math.h>
#include "parse.h"
#include "debug.h"
qsort(vpmap, entries, sizeof(struct value_pair), vp_cmp);
}
-static void show_option_range(struct fio_option *o, FILE *out)
+static void show_option_range(struct fio_option *o,
+ int (*logger)(const char *format, ...))
{
- if (!o->minval && !o->maxval)
- return;
+ if (o->type == FIO_OPT_FLOAT_LIST){
+ if (isnan(o->minfp) && isnan(o->maxfp))
+ return;
+
+ logger("%20s: min=%f", "range", o->minfp);
+ if (!isnan(o->maxfp))
+ logger(", max=%f", o->maxfp);
+ logger("\n");
+ } else {
+ if (!o->minval && !o->maxval)
+ return;
- fprintf(out, "%20s: min=%d", "range", o->minval);
- if (o->maxval)
- fprintf(out, ", max=%d", o->maxval);
- fprintf(out, "\n");
+ logger("%20s: min=%d", "range", o->minval);
+ if (o->maxval)
+ logger(", max=%d", o->maxval);
+ logger("\n");
+ }
}
static void show_option_values(struct fio_option *o)
if (!vp->ival)
continue;
- printf("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
+ log_info("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
if (vp->help)
- printf(" %s", vp->help);
- printf("\n");
+ log_info(" %s", vp->help);
+ log_info("\n");
}
if (i)
- printf("\n");
+ log_info("\n");
}
-static void show_option_help(struct fio_option *o, FILE *out)
+static void show_option_help(struct fio_option *o, int is_err)
{
const char *typehelp[] = {
"invalid",
"string (opt=bla)",
+ "string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
"string with time postfix (opt=10s)",
"string (opt=bla)",
"string with dual range (opt=1k-4k,4k-8k)",
"integer value (opt=100)",
"boolean value (opt=1)",
+ "list of floating point values separated by ':' (opt=5.9:7.8)",
"no argument (opt)",
"deprecated",
};
+ int (*logger)(const char *format, ...);
+
+ if (is_err)
+ logger = log_err;
+ else
+ logger = log_info;
if (o->alias)
- fprintf(out, "%20s: %s\n", "alias", o->alias);
+ logger("%20s: %s\n", "alias", o->alias);
- fprintf(out, "%20s: %s\n", "type", typehelp[o->type]);
- fprintf(out, "%20s: %s\n", "default", o->def ? o->def : "no default");
+ logger("%20s: %s\n", "type", typehelp[o->type]);
+ logger("%20s: %s\n", "default", o->def ? o->def : "no default");
if (o->prof_name)
- fprintf(out, "%20s: only for profile '%s'\n", "valid", o->prof_name);
- show_option_range(o, stdout);
+ logger("%20s: only for profile '%s'\n", "valid", o->prof_name);
+ show_option_range(o, logger);
show_option_values(o);
}
}
}
-static unsigned long long get_mult_bytes(char c, void *data)
+static unsigned long long __get_mult_bytes(const char *p, void *data,
+ int *percent)
{
unsigned int kb_base = fio_get_kb_base(data);
unsigned long long ret = 1;
+ unsigned int i, pow = 0, mult = kb_base;
+ char *c;
- switch (c) {
- default:
- break;
- case 'p':
- case 'P':
- ret *= (unsigned long long) kb_base;
- case 't':
- case 'T':
- ret *= (unsigned long long) kb_base;
- case 'g':
- case 'G':
- ret *= (unsigned long long) kb_base;
- case 'm':
- case 'M':
- ret *= (unsigned long long) kb_base;
- case 'k':
- case 'K':
- ret *= (unsigned long long) kb_base;
- break;
+ if (!p)
+ return 1;
+
+ c = strdup(p);
+
+ for (i = 0; i < strlen(c); i++)
+ c[i] = tolower(c[i]);
+
+ if (!strcmp("pib", c)) {
+ pow = 5;
+ mult = 1000;
+ } else if (!strcmp("tib", c)) {
+ pow = 4;
+ mult = 1000;
+ } else if (!strcmp("gib", c)) {
+ pow = 3;
+ mult = 1000;
+ } else if (!strcmp("mib", c)) {
+ pow = 2;
+ mult = 1000;
+ } else if (!strcmp("kib", c)) {
+ pow = 1;
+ mult = 1000;
+ } else if (!strcmp("p", c) || !strcmp("pb", c))
+ pow = 5;
+ else if (!strcmp("t", c) || !strcmp("tb", c))
+ pow = 4;
+ else if (!strcmp("g", c) || !strcmp("gb", c))
+ pow = 3;
+ else if (!strcmp("m", c) || !strcmp("mb", c))
+ pow = 2;
+ else if (!strcmp("k", c) || !strcmp("kb", c))
+ pow = 1;
+ else if (!strcmp("%", c)) {
+ *percent = 1;
+ return ret;
}
+ while (pow--)
+ ret *= (unsigned long long) mult;
+
+ free(c);
return ret;
}
+static unsigned long long get_mult_bytes(const char *str, int len, void *data,
+ int *percent)
+{
+ const char *p = str;
+ int digit_seen = 0;
+
+ if (len < 2)
+ return __get_mult_bytes(str, data, percent);
+
+ /*
+ * Go forward until we hit a non-digit, or +/- sign
+ */
+ while ((p - str) <= len) {
+ if (!isdigit((int) *p) &&
+ (((*p != '+') && (*p != '-')) || digit_seen))
+ break;
+ digit_seen |= isdigit((int) *p);
+ p++;
+ }
+
+ if (!isalpha((int) *p) && (*p != '%'))
+ p = NULL;
+
+ return __get_mult_bytes(p, data, percent);
+}
+
+/*
+ * 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));
+}
+
/*
* convert string into decimal value, noting any size suffix
*/
return 1;
if (kilo) {
- const char *p;
- /*
- * if the last char is 'b' or 'B', the user likely used
- * "1gb" instead of just "1g". If the second to last is also
- * a letter, adjust.
- */
- p = str + len - 1;
- if ((*p == 'b' || *p == 'B') && isalpha(*(p - 1)))
- --p;
+ unsigned long long mult;
+ int perc = 0;
- *val *= get_mult_bytes(*p, data);
+ mult = get_mult_bytes(str, len, data, &perc);
+ if (perc)
+ *val = -1ULL - *val;
+ else
+ *val *= mult;
} else
*val *= get_mult_time(str[len - 1]);
{
char *s = *p;
- while (isspace(*s))
+ while (isspace((int) *s))
s++;
*p = s;
p = s;
s = p + strlen(p);
- while ((isspace(*s) || iscntrl(*s)) && (s > start))
+ while ((isspace((int) *s) || iscntrl((int) *s)) && (s > start))
s--;
*(s + 1) = '\0';
static int check_range_bytes(const char *str, long *val, void *data)
{
- char suffix;
-
- if (!strlen(str))
- return 1;
+ long long __val;
- if (sscanf(str, "%lu%c", val, &suffix) == 2) {
- *val *= get_mult_bytes(suffix, data);
+ if (!str_to_decimal(str, &__val, 1, data)) {
+ *val = __val;
return 0;
}
- if (sscanf(str, "%lu", val) == 1)
- return 0;
-
return 1;
}
return 1;
}
+static int opt_len(const char *str)
+{
+ char *postfix;
+
+ postfix = strchr(str, ':');
+ if (!postfix)
+ return strlen(str);
+
+ return (int)(postfix - str);
+}
+
#define val_store(ptr, val, off, or, data) \
do { \
ptr = td_var((data), (off)); \
} while (0)
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
- int first, int more)
+ int first, int more, int curr)
{
int il, *ilp;
+ double* flp;
long long ull, *ullp;
long ul1, ul2;
+ double uf;
char **cp;
int ret = 0, is_time = 0;
+ const struct value_pair *vp;
+ struct value_pair posval[PARSE_MAX_VP];
+ int i, all_skipped = 1;
dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
o->type, ptr);
case FIO_OPT_STR:
case FIO_OPT_STR_MULTI: {
fio_opt_str_fn *fn = o->cb;
- const struct value_pair *vp;
- struct value_pair posval[PARSE_MAX_VP];
- int i, all_skipped = 1;
posval_sort(o, posval);
if (!vp->ival || vp->ival[0] == '\0')
continue;
all_skipped = 0;
- if (!strncmp(vp->ival, ptr, strlen(ptr))) {
+ if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
ret = 0;
if (o->roff1) {
if (vp->or)
}
break;
}
+ case FIO_OPT_FLOAT_LIST: {
+
+ if (first) {
+ ul2 = 1;
+ ilp = td_var(data, o->off2);
+ *ilp = ul2;
+ }
+ if (curr >= o->maxlen) {
+ fprintf(stderr, "the list exceeding max length %d\n",
+ o->maxlen);
+ return 1;
+ }
+ if(!str_to_float(ptr, &uf)){
+ fprintf(stderr, "not a floating point value: %s\n",
+ ptr);
+ return 1;
+ }
+ if (!isnan(o->maxfp) && uf > o->maxfp) {
+ fprintf(stderr, "value out of range: %f"
+ " (range max: %f)\n", uf, o->maxfp);
+ return 1;
+ }
+ if (!isnan(o->minfp) && uf < o->minfp) {
+ fprintf(stderr, "value out of range: %f"
+ " (range min: %f)\n", uf, o->minfp);
+ return 1;
+ }
+
+ flp = td_var(data, o->off1);
+ flp[curr] = uf;
+
+ break;
+ }
case FIO_OPT_STR_STORE: {
fio_opt_str_fn *fn = o->cb;
- if (o->roff1)
- cp = (char **) o->roff1;
- else
- cp = td_var(data, o->off1);
+ posval_sort(o, posval);
- *cp = strdup(ptr);
- if (fn) {
- ret = fn(data, ptr);
- if (ret) {
- free(*cp);
- *cp = NULL;
+ if (!o->posval[0].ival) {
+ vp = NULL;
+ goto match;
+ }
+
+ 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;
+
+ 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;
}
}
+
+ if (ret && !all_skipped)
+ show_option_values(o);
+ else if (fn && ptr)
+ ret = fn(data, ptr);
+
break;
}
case FIO_OPT_RANGE: {
strncpy(tmp, ptr, sizeof(tmp) - 1);
+ /* Handle bsrange with separate read,write values: */
+ p1 = strchr(tmp, ',');
+ if (p1)
+ *p1 = '\0';
+
p1 = strchr(tmp, '-');
if (!p1) {
p1 = strchr(tmp, ':');
break;
}
- case FIO_OPT_BOOL: {
+ case FIO_OPT_BOOL:
+ case FIO_OPT_STR_SET: {
fio_opt_int_fn *fn = o->cb;
- ret = check_int(ptr, &il);
+ if (ptr)
+ ret = check_int(ptr, &il);
+ else if (o->type == FIO_OPT_BOOL)
+ ret = 1;
+ else
+ il = 1;
+
if (ret)
break;
}
break;
}
- case FIO_OPT_STR_SET: {
- fio_opt_str_set_fn *fn = o->cb;
-
- if (fn)
- ret = fn(data);
- else {
- if (first) {
- if (o->roff1)
- *(unsigned int *) o->roff1 = 1;
- else
- val_store(ilp, 1, o->off1, 0, data);
- }
- if (!more) {
- if (o->roff2)
- *(unsigned int *) o->roff2 = 1;
- else if (o->off2)
- val_store(ilp, 1, o->off2, 0, data);
- }
- }
- break;
- }
case FIO_OPT_DEPRECATED:
- fprintf(stdout, "Option %s is deprecated\n", o->name);
+ log_info("Option %s is deprecated\n", o->name);
break;
default:
- fprintf(stderr, "Bad option type %u\n", o->type);
+ log_err("Bad option type %u\n", o->type);
ret = 1;
}
if (ret) {
fprintf(stderr,"Correct format for offending option\n");
fprintf(stderr, "%20s: %s\n", o->name, o->help);
- show_option_help(o, stderr);
+ show_option_help(o, 1);
}
}
ptr2 = NULL;
if (ptr &&
(o->type != FIO_OPT_STR_STORE) &&
- (o->type != FIO_OPT_STR)) {
+ (o->type != FIO_OPT_STR) &&
+ (o->type != FIO_OPT_FLOAT_LIST)) {
ptr2 = strchr(ptr, ',');
if (ptr2 && *(ptr2 + 1) == '\0')
*ptr2 = '\0';
if (!ptr2)
ptr2 = strchr(ptr, '-');
}
+ } else if (ptr && o->type == FIO_OPT_FLOAT_LIST) {
+ ptr2 = strchr(ptr, ':');
}
/*
* we are doing multiple arguments, we can allow the first one
* being empty.
*/
- __ret = __handle_option(o, ptr, data, !done, !!ptr2);
+ __ret = __handle_option(o, ptr, data, !done, !!ptr2, done);
if (ret)
ret = __ret;
o = find_option(options, opt);
if (!o) {
- fprintf(stderr, "Bad option <%s>\n", opt);
+ log_err("Bad option <%s>\n", opt);
return 1;
}
if (!handle_option(o, val, data))
return 0;
- fprintf(stderr, "fio: failed parsing %s=%s\n", opt, val);
+ log_err("fio: failed parsing %s=%s\n", opt, val);
return 1;
}
o = get_option(tmp, options, &post);
if (!o) {
- fprintf(stderr, "Bad option <%s>\n", tmp);
+ log_err("Bad option <%s>\n", tmp);
free(tmp);
return 1;
}
return 0;
}
- fprintf(stderr, "fio: failed parsing %s\n", opt);
+ log_err("fio: failed parsing %s\n", opt);
free(tmp);
return 1;
}
if (!match)
continue;
- show_option_help(o, stdout);
+ show_option_help(o, 0);
}
if (found)
if (closest && best_dist < 3) {
printf(" - showing closest match\n");
printf("%20s: %s\n", closest->name, closest->help);
- show_option_help(closest, stdout);
+ show_option_help(closest, 0);
} else
printf("\n");
o->minval = 0;
o->maxval = 1;
}
+ if (o->type == FIO_OPT_FLOAT_LIST) {
+ o->minfp = NAN;
+ o->maxfp = NAN;
+ }
if (o->type == FIO_OPT_STR_SET && o->def) {
- fprintf(stderr, "Option %s: string set option with"
+ log_err("Option %s: string set option with"
" default will always be true\n", o->name);
}
- if (!o->cb && (!o->off1 && !o->roff1)) {
- fprintf(stderr, "Option %s: neither cb nor offset given\n",
- o->name);
- }
+ if (!o->cb && (!o->off1 && !o->roff1))
+ log_err("Option %s: neither cb nor offset given\n", o->name);
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))) {
- fprintf(stderr, "Option %s: both cb and offset given\n",
- o->name);
+ log_err("Option %s: both cb and offset given\n", o->name);
}
}
projects / fio.git / blobdiff