#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"
static struct fio_option *fio_options;
extern unsigned int fio_get_kb_base(void *);
static void show_option_range(struct fio_option *o,
int (*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;
}
}
+static int is_separator(char c)
+{
+ switch (c) {
+ case ':':
+ case '-':
+ case ',':
+ case '/':
+ return 1;
+ default:
+ return 0;
+ }
+}
+
static unsigned long long __get_mult_bytes(const char *p, void *data,
int *percent)
{
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)) {
pow = 5;
/*
* Convert string into a floating number. Return 1 for success and 0 otherwise.
*/
-static int str_to_float(const char *str, double *val)
+int str_to_float(const char *str, double *val)
{
return (1 == sscanf(str, "%lf", val));
}
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)
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;
}
+ 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);
break;
}
case FIO_OPT_FLOAT_LIST: {
+ char *cp2;
if (first) {
- ul2 = 1;
+ /*
+ ** 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;
+
+ flp = td_var(data, 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)) {
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;
+
+ /*
+ ** 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++;
+
+ ilp = td_var(data, o->off2);
+ if (len > *ilp)
+ *ilp = len;
+ }
break;
}
cp = td_var(data, o->off1);
*cp = strdup(ptr);
- } else {
- cp = NULL;
}
if (fn)
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))) {
char *rest;
ret = 0;
return 1;
}
- if (!handle_option(*o, post, data)) {
+ if (!handle_option(*o, post, data))
return 0;
- }
log_err("fio: failed parsing %s\n", input);
return 1;
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) {
log_err("Option %s: string set option with"
}
if (!o->cb && (!o->off1 && !o->roff1))
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);
+ 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;
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)
projects / fio.git / blobdiff