static void show_option_values(struct fio_option *o)
{
- int i = 0;
+ int i;
- do {
+ for (i = 0; i < PARSE_MAX_VP; i++) {
const struct value_pair *vp = &o->posval[i];
if (!vp->ival)
- break;
+ continue;
printf("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
if (vp->help)
printf(" %s", vp->help);
printf("\n");
- i++;
- } while (i < PARSE_MAX_VP);
+ }
if (i)
printf("\n");
static void show_option_help(struct fio_option *o, FILE *out)
{
const char *typehelp[] = {
+ "invalid",
"string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
"string with time postfix (opt=10s)",
"integer value (opt=100)",
"boolean value (opt=1)",
"no argument (opt)",
+ "deprecated",
};
if (o->alias)
fprintf(out, "%20s: %s\n", "type", typehelp[o->type]);
fprintf(out, "%20s: %s\n", "default", o->def ? o->def : "no default");
+ if (o->prof_name)
+ fprintf(out, "%20s: only for profile '%s'\n", "valid", o->prof_name);
show_option_range(o, stdout);
show_option_values(o);
}
return 1;
}
-static inline int o_match(struct fio_option *o, const char *opt)
-{
- if (!strcmp(o->name, opt))
- return 1;
- else if (o->alias && !strcmp(o->alias, opt))
- return 1;
-
- return 0;
-}
-
-static struct fio_option *find_option(struct fio_option *options,
- struct flist_head *eops, const char *opt)
-{
- struct flist_head *n;
- struct fio_option *o;
-
- for (o = &options[0]; o->name; o++)
- if (o_match(o, opt))
- return o;
-
- if (!eops)
- return NULL;
-
- flist_for_each(n, eops) {
- struct ext_option *eopt;
-
- eopt = flist_entry(n, struct ext_option, list);
- if (o_match(&eopt->o, opt))
- return &eopt->o;
- }
-
- return NULL;
-}
-
-#define val_store(ptr, val, off, data) \
+#define val_store(ptr, val, off, or, data) \
do { \
ptr = td_var((data), (off)); \
- *ptr = (val); \
+ if ((or)) \
+ *ptr |= (val); \
+ else \
+ *ptr = (val); \
} while (0)
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
}
switch (o->type) {
- case FIO_OPT_STR: {
+ case FIO_OPT_STR:
+ case FIO_OPT_STR_MULTI: {
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);
+ ret = 1;
for (i = 0; i < PARSE_MAX_VP; i++) {
vp = &posval[i];
if (!vp->ival || vp->ival[0] == '\0')
- break;
- ret = 1;
+ continue;
+ all_skipped = 0;
if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
ret = 0;
- if (o->roff1)
- *(unsigned int *) o->roff1 = vp->oval;
- else {
+ if (o->roff1) {
+ if (vp->or)
+ *(unsigned int *) o->roff1 |= vp->oval;
+ else
+ *(unsigned int *) o->roff1 = vp->oval;
+ } else {
if (!o->off1)
- break;
- val_store(ilp, vp->oval, o->off1, data);
+ continue;
+ val_store(ilp, vp->oval, o->off1, vp->or, data);
}
- break;
+ continue;
}
}
- 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, data);
+ 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, data);
+ val_store(ilp, ull, o->off2, 0, data);
}
} else {
if (first) {
if (o->roff1)
*(unsigned long long *) o->roff1 = ull;
else
- val_store(ullp, ull, o->off1, data);
+ val_store(ullp, ull, o->off1, 0, data);
}
if (!more) {
if (o->roff2)
*(unsigned long long *) o->roff2 = ull;
else if (o->off2)
- val_store(ullp, ull, o->off2, data);
+ val_store(ullp, 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, data);
+ 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, data);
+ 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, data);
- val_store(ilp, ul2, o->off4, data);
+ val_store(ilp, ul1, o->off3, 0, data);
+ val_store(ilp, ul2, o->off4, 0, data);
}
}
if (o->roff1)
*(unsigned int *)o->roff1 = il;
else
- val_store(ilp, il, o->off1, data);
+ val_store(ilp, il, o->off1, 0, data);
}
if (!more) {
if (o->roff2)
*(unsigned int *) o->roff2 = il;
else if (o->off2)
- val_store(ilp, il, o->off2, data);
+ val_store(ilp, il, o->off2, 0, data);
}
}
break;
if (o->roff1)
*(unsigned int *) o->roff1 = 1;
else
- val_store(ilp, 1, o->off1, data);
+ 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, data);
+ val_store(ilp, 1, o->off2, 0, data);
}
}
break;
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,
- struct fio_option *options,
- struct flist_head *eops, char **post)
+ struct fio_option *options, char **post)
{
struct fio_option *o;
char *ret;
ret = (char *) opt;
(*post)++;
strip_blank_end(ret);
- o = find_option(options, eops, ret);
+ o = find_option(options, ret);
} else {
- o = find_option(options, eops, opt);
+ o = find_option(options, opt);
*post = NULL;
}
s1 = strdup(*((char **) p1));
s2 = strdup(*((char **) p2));
- o1 = get_option(s1, fio_options, NULL, &foo);
- o2 = get_option(s2, fio_options, NULL, &foo);
+ o1 = get_option(s1, fio_options, &foo);
+ o2 = get_option(s2, fio_options, &foo);
prio1 = prio2 = 0;
if (o1)
}
int parse_cmd_option(const char *opt, const char *val,
- struct fio_option *options, struct flist_head *eops,
- void *data)
+ struct fio_option *options, void *data)
{
struct fio_option *o;
- o = find_option(options, eops, opt);
+ o = find_option(options, opt);
if (!o) {
fprintf(stderr, "Bad option <%s>\n", opt);
return 1;
ssize_t nchr = OPT_LEN_MAX;
size_t envlen;
- if (strlen(in) + 1 > OPT_LEN_MAX) {
+ if (strlen(opt) + 1 > OPT_LEN_MAX) {
fprintf(stderr, "OPT_LEN_MAX (%d) is too small\n", OPT_LEN_MAX);
return NULL;
}
return strdup(out);
}
-int parse_option(const char *opt, struct fio_option *options,
- struct flist_head *ext_opt_list, void *data)
+int parse_option(const char *opt, struct fio_option *options, void *data)
{
struct fio_option *o;
char *post, *tmp;
if (!tmp)
return 1;
- o = get_option(tmp, options, ext_opt_list, &post);
+ o = get_option(tmp, options, &post);
if (!o) {
fprintf(stderr, "Bad option <%s>\n", tmp);
free(tmp);
} while (printed);
}
-int show_cmd_help(struct fio_option *options, struct flist_head *ext_opts,
- const char *name)
+int show_cmd_help(struct fio_option *options, const char *name)
{
- struct flist_head *n;
- struct ext_option *eo;
struct fio_option *o, *closest;
- unsigned int best_dist;
+ unsigned int best_dist = -1U;
int found = 0;
int show_all = 0;
if (o->type == FIO_OPT_DEPRECATED)
continue;
+ if (!exec_profile && o->prof_name)
+ continue;
if (name) {
if (!strcmp(name, o->name) ||
if (show_all || match) {
found = 1;
if (match)
- printf("%24s: %s\n", o->name, o->help);
+ printf("%20s: %s\n", o->name, o->help);
if (show_all) {
if (!o->parent)
print_option(o);
if (found)
return 0;
- flist_for_each(n, ext_opts) {
- eo = flist_entry(n, struct ext_option, list);
- o = &eo->o;
- if (!strcmp(name, o->name) ||
- (o->alias && !strcmp(name, o->alias))) {
- printf("%20s: %s\n", o->name, o->help);
- show_option_help(o, stdout);
- printf("%20s: External, valid for '%s'\n", "Restriction", eo->prof_name);
- 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);
fprintf(stderr, "Option %s: neither cb nor offset given\n",
o->name);
}
- if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE)
+ if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
+ o->type == FIO_OPT_STR_MULTI)
return;
if (o->cb && ((o->off1 || o->off2 || o->off3 || o->off4) ||
(o->roff1 || o->roff2 || o->roff3 || o->roff4))) {
projects / fio.git / blobdiff