X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=parse.c;h=c2c5bf29a51e8dbd0a5fbe99808e7e9ac277dbdc;hb=833491908a1afd67;hp=bb138e55f967fbeb6aa09690b79fa4b18092cbb4;hpb=bd4d7e1ecd2388b89254148209ac2b172def8ebf;p=fio.git diff --git a/parse.c b/parse.c index bb138e55..c2c5bf29 100644 --- a/parse.c +++ b/parse.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "parse.h" #include "debug.h" @@ -45,13 +46,23 @@ static void posval_sort(struct fio_option *o, struct value_pair *vpmap) static void show_option_range(struct fio_option *o, FILE *out) { - if (!o->minval && !o->maxval) - return; + if (o->type == FIO_OPT_FLOAT_LIST){ + if (isnan(o->minfp) && isnan(o->maxfp)) + return; + + fprintf(out, "%20s: min=%f", "range", o->minfp); + if (!isnan(o->maxfp)) + fprintf(out, ", max=%f", o->maxfp); + fprintf(out, "\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"); + fprintf(out, "%20s: min=%d", "range", o->minval); + if (o->maxval) + fprintf(out, ", max=%d", o->maxval); + fprintf(out, "\n"); + } } static void show_option_values(struct fio_option *o) @@ -86,6 +97,7 @@ static void show_option_help(struct fio_option *o, FILE *out) "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", }; @@ -118,7 +130,8 @@ static unsigned long get_mult_time(char c) } } -static unsigned long long __get_mult_bytes(const char *p, 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; @@ -158,6 +171,10 @@ static unsigned long long __get_mult_bytes(const char *p, void *data) 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; @@ -166,25 +183,35 @@ static unsigned long long __get_mult_bytes(const char *p, void *data) return ret; } -static unsigned long long get_mult_bytes(const char *str, int len, void *data) +static unsigned long long get_mult_bytes(const char *str, int len, void *data, + int *percent) { - const char *p; + const char *p = str; if (len < 2) - return __get_mult_bytes(str, data); + return __get_mult_bytes(str, data, percent); - /* - * 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; - while (isalpha(*(p - 1))) - p--; - if (!isalpha(*p)) + /* + * Go forward until we hit a non-digit + */ + while ((p - str) <= len) { + if (!isdigit((int) *p)) + break; + p++; + } + + if (!isalpha((int) *p) && (*p != '%')) p = NULL; - return __get_mult_bytes(p, data); + 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)); } /* @@ -207,9 +234,16 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data) if (*val == LONG_MAX && errno == ERANGE) return 1; - if (kilo) - *val *= get_mult_bytes(str, len, data); - else + if (kilo) { + unsigned long long mult; + int perc = 0; + + mult = get_mult_bytes(str, len, data, &perc); + if (perc) + *val = -1ULL - *val; + else + *val *= mult; + } else *val *= get_mult_time(str[len - 1]); return 0; @@ -229,7 +263,7 @@ void strip_blank_front(char **p) { char *s = *p; - while (isspace(*s)) + while (isspace((int) *s)) s++; *p = s; @@ -249,7 +283,7 @@ void strip_blank_end(char *p) 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'; @@ -303,11 +337,13 @@ static int opt_len(const char *str) } 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; @@ -415,6 +451,39 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, } 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; @@ -439,6 +508,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, 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, ':'); @@ -484,10 +558,17 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, 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; @@ -523,27 +604,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, } 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); break; @@ -591,7 +651,8 @@ static int handle_option(struct fio_option *o, const char *__ptr, void *data) 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'; @@ -601,6 +662,8 @@ static int handle_option(struct fio_option *o, const char *__ptr, void *data) if (!ptr2) ptr2 = strchr(ptr, '-'); } + } else if (ptr && o->type == FIO_OPT_FLOAT_LIST) { + ptr2 = strchr(ptr, ':'); } /* @@ -608,7 +671,7 @@ static int handle_option(struct fio_option *o, const char *__ptr, void *data) * 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; @@ -963,6 +1026,10 @@ void option_init(struct fio_option *o) 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" " default will always be true\n", o->name);