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;
}
}
+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 (!strncmp("pib", c, 3)) {
pow = 5;
" (%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) {
+ /*
+ ** 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);
flp = td_var(data, o->off1);
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;
}
case FIO_OPT_STR_STORE: {
}
if (!o->cb && (!o->off1 && !o->roff1))
log_err("Option %s: neither cb nor offset given\n", o->name);
+ if (!o->category) {
+ 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;
(o->roff1 || o->roff2 || o->roff3 || o->roff4))) {
log_err("Option %s: both cb and 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;
- }
}
/*