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)",
}
}
-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;
+
+ if (len < 2)
+ return __get_mult_bytes(str, data, percent);
+
+ /*
+ * 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, percent);
+}
+
/*
* 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;
+ long long __val;
- if (!strlen(str))
- return 1;
-
- 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)); \
if (!vp->ival || vp->ival[0] == '\0')
continue;
all_skipped = 0;
- if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
+ if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
ret = 0;
if (o->roff1) {
if (vp->or)
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);
break;
projects / fio.git / blobdiff