X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=parse.c;h=57865b112e7a9118a9a4e6fc3dd0a60a0d66a9a8;hb=cade3ef44669c5c962d7ed18ca0e361116ee44ad;hp=84a0f52ab54f025d48a0bca3a4f8650ed421a825;hpb=c167dedce798151c8aa8a59be45ce57a5260b1aa;p=fio.git

diff --git a/parse.c b/parse.c
index 84a0f52a..57865b11 100644
--- a/parse.c
+++ b/parse.c
@@ -11,6 +11,32 @@
 
 #include "parse.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)
 {
 	if (!o->minval && !o->maxval)
@@ -21,18 +47,18 @@ 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);
 
@@ -195,10 +221,13 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 	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;
@@ -379,6 +408,8 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
 		ptr2 = strchr(ptr, ',');
 		if (!ptr2)
 			ptr2 = strchr(ptr, ':');
+		if (!ptr2)
+			ptr2 = strchr(ptr, '-');
 	}
 
 	/*
@@ -500,6 +531,9 @@ static void show_option_help(struct fio_option *o)
 		"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);
@@ -522,7 +556,8 @@ int show_cmd_help(struct fio_option *options, const char *name)
 		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;
@@ -590,6 +625,8 @@ void options_init(struct fio_option *options)
 			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)