#include <limits.h>
#include "parse.h"
+#include "debug.h"
+
+static int vp_cmp(const void *p1, const void *p2)
+{
+ const struct value_pair *vp1 = p1;
+ const struct value_pair *vp2 = p2;
+
+ return strlen(vp2->ival) - strlen(vp1->ival);
+}
+
+static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
+{
+ const struct value_pair *vp;
+ int entries;
+
+ memset(vpmap, 0, PARSE_MAX_VP * sizeof(struct value_pair));
+
+ for (entries = 0; entries < PARSE_MAX_VP; entries++) {
+ vp = &o->posval[entries];
+ if (!vp->ival || vp->ival[0] == '\0')
+ break;
+
+ memcpy(&vpmap[entries], vp, sizeof(*vp));
+ }
+
+ qsort(vpmap, entries, sizeof(struct value_pair), vp_cmp);
+}
static void show_option_range(struct fio_option *o)
{
static void show_option_values(struct fio_option *o)
{
- const char *msg;
int i = 0;
do {
- msg = o->posval[i].ival;
- if (!msg)
- break;
+ const struct value_pair *vp = &o->posval[i];
- if (!i)
- printf("%20s: ", "valid values");
+ if (!vp->ival)
+ break;
- printf("%s,", msg);
+ printf("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
+ if (vp->help)
+ printf(" %s", vp->help);
+ printf("\n");
i++;
} while (i < PARSE_MAX_VP);
/*
* convert string into decimal value, noting any size suffix
*/
-static int str_to_decimal(const char *str, long long *val, int kilo)
+int str_to_decimal(const char *str, long long *val, int kilo)
{
int len;
while (isspace(*s))
s++;
+
+ *p = s;
}
void strip_blank_end(char *p)
{
- char *s = p + strlen(p) - 1;
-
- while (isspace(*s) || iscntrl(*s))
+ char *s;
+
+ s = strchr(p, ';');
+ if (s)
+ *s = '\0';
+ s = strchr(p, '#');
+ if (s)
+ *s = '\0';
+ if (s)
+ p = s;
+
+ s = p + strlen(p);
+ while ((isspace(*s) || iscntrl(*s)) && (s > p))
s--;
*(s + 1) = '\0';
{
if (!strlen(p))
return 1;
- if (sscanf(p, "%u", val) == 1)
- return 0;
+ if (strstr(p, "0x") || strstr(p, "0X")) {
+ if (sscanf(p, "%x", val) == 1)
+ return 0;
+ } else {
+ if (sscanf(p, "%u", val) == 1)
+ return 0;
+ }
return 1;
}
char **cp;
int ret = 0, is_time = 0;
+ dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
+ o->type, ptr);
+
if (!ptr && o->type != FIO_OPT_STR_SET) {
fprintf(stderr, "Option %s requires an argument\n", o->name);
return 1;
case FIO_OPT_STR: {
fio_opt_str_fn *fn = o->cb;
const struct value_pair *vp;
+ struct value_pair posval[PARSE_MAX_VP];
int i;
+ posval_sort(o, posval);
+
for (i = 0; i < PARSE_MAX_VP; i++) {
- vp = &o->posval[i];
+ vp = &posval[i];
if (!vp->ival || vp->ival[0] == '\0')
break;
ret = 1;
val_store(ilp, ul1, o->off1, data);
val_store(ilp, ul2, o->off2, data);
}
- if (!more && o->off3 && o->off4) {
+ if (o->off3 && o->off4) {
val_store(ilp, ul1, o->off3, data);
val_store(ilp, ul2, o->off4, data);
}
const char *ptr2 = NULL;
int r1, r2;
+ dprint(FD_PARSE, "handle_option=%s, ptr=%s\n", o->name, 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
ptr2 = strchr(ptr, ',');
if (!ptr2)
ptr2 = strchr(ptr, ':');
+ if (!ptr2)
+ ptr2 = strchr(ptr, '-');
}
/*
{
struct fio_option *o;
char *pre, *post;
- char tmp[64];
+ char *tmp;
- strncpy(tmp, opt, sizeof(tmp) - 1);
+ tmp = strdup(opt);
pre = strchr(tmp, '=');
if (pre) {
if (!o) {
fprintf(stderr, "Bad option %s\n", tmp);
+ free(tmp);
return 1;
}
- if (!handle_option(o, post, data))
+ if (!handle_option(o, post, data)) {
+ free(tmp);
return 0;
+ }
fprintf(stderr, "fio: failed parsing %s\n", opt);
+ free(tmp);
return 1;
}
"no argument (opt)",
};
+ if (o->alias)
+ printf("%20s: %s\n", "alias", o->alias);
+
printf("%20s: %s\n", "type", typehelp[o->type]);
printf("%20s: %s\n", "default", o->def ? o->def : "no default");
show_option_range(o);
show_option_values(o);
}
+static struct fio_option *find_child(struct fio_option *options,
+ struct fio_option *o)
+{
+ struct fio_option *__o;
+
+ for (__o = options + 1; __o->name; __o++)
+ if (__o->parent && !strcmp(__o->parent, o->name))
+ return __o;
+
+ return NULL;
+}
+
+static void __print_option(struct fio_option *o, struct fio_option *org,
+ int level)
+{
+ char name[256], *p;
+ int depth;
+
+ if (!o)
+ return;
+ if (!org)
+ org = o;
+
+ p = name;
+ depth = level;
+ while (depth--)
+ p += sprintf(p, "%s", " ");
+
+ sprintf(p, "%s", o->name);
+
+ printf("%-24s: %s\n", name, o->help);
+}
+
+static void print_option(struct fio_option *o)
+{
+ struct fio_option *parent;
+ struct fio_option *__o;
+ unsigned int printed;
+ unsigned int level;
+
+ __print_option(o, NULL, 0);
+ parent = o;
+ level = 0;
+ do {
+ level++;
+ printed = 0;
+
+ while ((__o = find_child(o, parent)) != NULL) {
+ __print_option(__o, o, level);
+ o = __o;
+ printed++;
+ }
+
+ parent = o;
+ } while (printed);
+}
+
int show_cmd_help(struct fio_option *options, const char *name)
{
struct fio_option *o, *closest;
int match = 0;
if (name) {
- if (!strcmp(name, o->name))
+ if (!strcmp(name, o->name) ||
+ (o->alias && !strcmp(name, o->alias)))
match = 1;
else {
unsigned int dist;
if (show_all || match) {
found = 1;
if (match)
- printf("%20s: %s\n", o->name, o->help);
+ printf("%24s: %s\n", o->name, o->help);
if (show_all) {
- printf("%-20s: %s\n", o->name, o->help);
+ if (!o->parent)
+ print_option(o);
continue;
}
}
{
struct fio_option *o;
+ dprint(FD_PARSE, "filling default options\n");
+
for (o = &options[0]; o->name; o++)
if (o->def)
handle_option(o, o->def, data);
{
struct fio_option *o;
+ dprint(FD_PARSE, "init options\n");
+
for (o = &options[0]; o->name; o++) {
if (o->type == FIO_OPT_BOOL) {
o->minval = 0;
o->maxval = 1;
}
+ if (o->type == FIO_OPT_STR_SET && o->def)
+ fprintf(stderr, "Option %s: string set option with default will always be true\n", o->name);
if (!o->cb && !o->off1)
fprintf(stderr, "Option %s: neither cb nor offset given\n", o->name);
if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE)