}
}
-static unsigned long long get_mult_bytes(char c, void *data)
+static unsigned long long __get_mult_bytes(const char *p, void *data)
{
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;
+
+ 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)
+{
+ 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;
+ while (isalpha(*(p - 1)))
+ p--;
+ if (!isalpha(*p))
+ p = NULL;
+
+ return __get_mult_bytes(p, data);
+}
+
/*
* convert string into decimal value, noting any size suffix
*/
if (*val == LONG_MAX && errno == ERANGE)
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;
-
- *val *= get_mult_bytes(*p, data);
- } else
+ if (kilo)
+ *val *= get_mult_bytes(str, len, data);
+ else
*val *= get_mult_time(str[len - 1]);
return 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;
}
fio_opt_str_fn *fn = o->cb;
const struct value_pair *vp;
struct value_pair posval[PARSE_MAX_VP];
- int i;
+ int i, all_skipped = 1;
posval_sort(o, posval);
vp = &posval[i];
if (!vp->ival || vp->ival[0] == '\0')
continue;
- if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
+ all_skipped = 0;
+ if (!strncmp(vp->ival, ptr, strlen(ptr))) {
ret = 0;
if (o->roff1) {
if (vp->or)
}
}
- if (ret)
+ if (ret && !all_skipped)
show_option_values(o);
else if (fn)
ret = fn(data, ptr);
if (o->type == FIO_OPT_INT) {
if (first) {
if (o->roff1)
- *(unsigned long long *) o->roff1 = ull;
+ *(unsigned int *) o->roff1 = ull;
else
val_store(ilp, ull, o->off1, 0, data);
}
if (!more) {
if (o->roff2)
- *(unsigned long long *) o->roff2 = ull;
+ *(unsigned int *) o->roff2 = ull;
else if (o->off2)
val_store(ilp, ull, o->off2, 0, data);
}
if (first) {
if (o->roff1)
- *(unsigned long *) o->roff1 = ul1;
+ *(unsigned int *) o->roff1 = ul1;
else
val_store(ilp, ul1, o->off1, 0, data);
if (o->roff2)
- *(unsigned long *) o->roff2 = ul2;
+ *(unsigned int *) o->roff2 = ul2;
else
val_store(ilp, ul2, o->off2, 0, data);
}
if (o->roff3 && o->roff4) {
- *(unsigned long *) o->roff3 = ul1;
- *(unsigned long *) o->roff4 = ul2;
+ *(unsigned int *) o->roff3 = ul1;
+ *(unsigned int *) o->roff4 = ul2;
} else if (o->off3 && o->off4) {
val_store(ilp, ul1, o->off3, 0, data);
val_store(ilp, ul2, o->off4, 0, data);
static int handle_option(struct fio_option *o, const char *__ptr, void *data)
{
- char *ptr, *ptr2 = NULL;
- int r1, r2;
+ char *o_ptr, *ptr, *ptr2;
+ int ret, done;
dprint(FD_PARSE, "handle_option=%s, ptr=%s\n", o->name, __ptr);
- ptr = NULL;
+ o_ptr = ptr = NULL;
if (__ptr)
- ptr = strdup(__ptr);
+ o_ptr = ptr = strdup(__ptr);
/*
- * See if we have a second set of parameters, hidden after a comma.
- * Do this before parsing the first round, to check if we should
+ * See if we have another set of parameters, hidden after a comma.
+ * Do this before parsing this round, to check if we should
* copy set 1 options to set 2.
*/
- if (ptr &&
- (o->type != FIO_OPT_STR_STORE) &&
- (o->type != FIO_OPT_STR)) {
- ptr2 = strchr(ptr, ',');
- if (ptr2 && *(ptr2 + 1) == '\0')
- *ptr2 = '\0';
- if (!ptr2)
- ptr2 = strchr(ptr, ':');
- if (!ptr2)
- ptr2 = strchr(ptr, '-');
- }
+ done = 0;
+ ret = 1;
+ do {
+ int __ret;
+
+ ptr2 = NULL;
+ if (ptr &&
+ (o->type != FIO_OPT_STR_STORE) &&
+ (o->type != FIO_OPT_STR)) {
+ ptr2 = strchr(ptr, ',');
+ if (ptr2 && *(ptr2 + 1) == '\0')
+ *ptr2 = '\0';
+ if (o->type != FIO_OPT_STR_MULTI) {
+ if (!ptr2)
+ ptr2 = strchr(ptr, ':');
+ if (!ptr2)
+ ptr2 = strchr(ptr, '-');
+ }
+ }
- /*
- * Don't return early if parsing the first option fails - if
- * we are doing multiple arguments, we can allow the first one
- * being empty.
- */
- r1 = __handle_option(o, ptr, data, 1, !!ptr2);
+ /*
+ * Don't return early if parsing the first option fails - if
+ * we are doing multiple arguments, we can allow the first one
+ * being empty.
+ */
+ __ret = __handle_option(o, ptr, data, !done, !!ptr2);
+ if (ret)
+ ret = __ret;
- if (!ptr2) {
- if (ptr)
- free(ptr);
- return r1;
- }
+ if (!ptr2)
+ break;
- ptr2++;
- r2 = __handle_option(o, ptr2, data, 0, 0);
+ ptr = ptr2 + 1;
+ done++;
+ } while (1);
- if (ptr)
- free(ptr);
- return r1 && r2;
+ if (o_ptr)
+ free(o_ptr);
+ return ret;
}
static struct fio_option *get_option(const char *opt,
int show_cmd_help(struct fio_option *options, const char *name)
{
struct fio_option *o, *closest;
- unsigned int best_dist;
+ unsigned int best_dist = -1U;
int found = 0;
int show_all = 0;
return 0;
printf("No such command: %s", name);
- if (closest) {
+
+ /*
+ * Only print an appropriately close option, one where the edit
+ * distance isn't too big. Otherwise we get crazy matches.
+ */
+ if (closest && best_dist < 3) {
printf(" - showing closest match\n");
printf("%20s: %s\n", closest->name, closest->help);
show_option_help(closest, stdout);
projects / fio.git / blobdiff