X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=9015b1d72bd5a527ef36ed0db12646ce01fcc945;hp=29e2ff1ce9d347a8017f1685711264bcdd6900e0;hb=f7150a9194e407f9b6a00bdf42038b0233a5ed44;hpb=0c9baf913d6d251973798048d29c60507f486ee6

diff --git a/parse.c b/parse.c
index 29e2ff1c..9015b1d7 100644
--- a/parse.c
+++ b/parse.c
@@ -11,6 +11,61 @@
 
 #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)
+		return;
+
+	printf("%20s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+}
+
+static void show_option_values(struct fio_option *o)
+{
+	int i = 0;
+
+	do {
+		const struct value_pair *vp = &o->posval[i];
+
+		if (!vp->ival)
+			break;
+
+		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 unsigned long get_mult_time(char c)
 {
 	switch (c) {
@@ -40,6 +95,9 @@ static unsigned long get_mult_bytes(char c)
 		case 'g':
 		case 'G':
 			return 1024 * 1024 * 1024;
+		case 'e':
+		case 'E':
+			return 1024 * 1024 * 1024 * 1024UL;
 		default:
 			return 1;
 	}
@@ -56,7 +114,7 @@ static int str_to_decimal(const char *str, long long *val, int kilo)
 	if (!len)
 		return 1;
 
-	*val = strtol(str, NULL, 10);
+	*val = strtoll(str, NULL, 10);
 	if (*val == LONG_MAX && errno == ERANGE)
 		return 1;
 
@@ -84,12 +142,24 @@ void strip_blank_front(char **p)
 
 	while (isspace(*s))
 		s++;
+
+	*p = s;
 }
 
 void strip_blank_end(char *p)
 {
-	char *s = p + strlen(p) - 1;
-
+	char *s;
+
+	s = strchr(p, ';');
+	if (s)
+		*s = '\0';
+	s = strchr(p, '#');
+	if (s)
+		*s = '\0';
+	if (s)
+		p = s;
+
+	s = p + strlen(p) - 1;
 	while (isspace(*s) || iscntrl(*s))
 		s--;
 
@@ -162,8 +232,30 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 	switch (o->type) {
 	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 = &posval[i];
+			if (!vp->ival || vp->ival[0] == '\0')
+				break;
+			ret = 1;
+			if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
+				ret = 0;
+				if (!o->off1)
+					break;
+				val_store(ilp, vp->oval, o->off1, data);
+				break;
+			}
+		}
 
-		ret = fn(data, ptr);
+		if (ret)
+			show_option_values(o);
+		else if (fn)
+			ret = fn(data, ptr);
 		break;
 	}
 	case FIO_OPT_STR_VAL_TIME:
@@ -206,10 +298,20 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		}
 		break;
 	}
-	case FIO_OPT_STR_STORE:
+	case FIO_OPT_STR_STORE: {
+		fio_opt_str_fn *fn = o->cb;
+
 		cp = td_var(data, o->off1);
 		*cp = strdup(ptr);
+		if (fn) {
+			ret = fn(data, ptr);
+			if (ret) {
+				free(*cp);
+				*cp = NULL;
+			}
+		}
 		break;
+	}
 	case FIO_OPT_RANGE: {
 		char tmp[128];
 		char *p1, *p2;
@@ -312,10 +414,14 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
 	 * Do this before parsing the first round, to check if we should
 	 * copy set 1 options to set 2.
 	 */
-	if (ptr) {
+	if (ptr &&
+	    (o->type != FIO_OPT_STR_STORE) &&
+	    (o->type != FIO_OPT_STR)) {
 		ptr2 = strchr(ptr, ',');
 		if (!ptr2)
 			ptr2 = strchr(ptr, ':');
+		if (!ptr2)
+			ptr2 = strchr(ptr, '-');
 	}
 
 	/*
@@ -356,9 +462,9 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
 {
 	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) {
@@ -374,51 +480,61 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
 
 	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;
 }
 
-static void show_option_range(struct fio_option *o)
+/*
+ * Option match, levenshtein distance. Handy for not quite remembering what
+ * the option name is.
+ */
+static int string_distance(const char *s1, const char *s2)
 {
-	if (!o->minval && !o->maxval)
-		return;
-
-	printf("%16s: min=%d, max=%d\n", "range", o->minval, o->maxval);
-}
+	unsigned int s1_len = strlen(s1);
+	unsigned int s2_len = strlen(s2);
+	unsigned int *p, *q, *r;
+	unsigned int i, j;
 
-static void show_option_values(struct fio_option *o)
-{
-	const char *msg;
-	int i = 0;
+	p = malloc(sizeof(unsigned int) * (s2_len + 1));
+	q = malloc(sizeof(unsigned int) * (s2_len + 1));
 
-	if (!o->posval)
-		return;
+	p[0] = 0;
+	for (i = 1; i <= s2_len; i++)
+		p[i] = p[i - 1] + 1;
 
-	do {
-		msg = o->posval[i];
-		if (!msg)
-			break;
+	for (i = 1; i <= s1_len; i++) {
+		q[0] = p[0] + 1;
+		for (j = 1; j <= s2_len; j++) {
+			unsigned int sub = p[j - 1];
 
-		if (!i)
-			printf("%16s: ", "valid values");
+			if (s1[i - 1] != s2[j - 1])
+				sub++;
 
-		printf("%s,", msg);
-		i++;
-	} while (1);
+			q[j] = min(p[j] + 1, min(q[j - 1] + 1, sub));
+		}
+		r = p;
+		p = q;
+		q = r;
+	}
 
-	if (i)
-		printf("\n");
+	i = p[s2_len];
+	free(p);
+	free(q);
+	return i;
 }
 
-int show_cmd_help(struct fio_option *options, const char *name)
+static void show_option_help(struct fio_option *o)
 {
-	int show_all = !strcmp(name, "all");
 	const char *typehelp[] = {
 		"string (opt=bla)",
 		"string with possible k/m/g postfix (opt=4k)",
@@ -430,32 +546,73 @@ int show_cmd_help(struct fio_option *options, const char *name)
 		"boolean value (opt=1)",
 		"no argument (opt)",
 	};
-	struct fio_option *o;
+
+	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);
+}
+
+int show_cmd_help(struct fio_option *options, const char *name)
+{
+	struct fio_option *o, *closest;
+	unsigned int best_dist;
 	int found = 0;
+	int show_all = 0;
 
+	if (!name || !strcmp(name, "all"))
+		show_all = 1;
+
+	closest = NULL;
+	best_dist = -1;
 	for (o = &options[0]; o->name; o++) {
-		int match = !strcmp(name, o->name);
+		int match = 0;
+
+		if (name) {
+			if (!strcmp(name, o->name) ||
+			    (o->alias && !strcmp(name, o->alias)))
+				match = 1;
+			else {
+				unsigned int dist;
+
+				dist = string_distance(name, o->name);
+				if (dist < best_dist) {
+					best_dist = dist;
+					closest = o;
+				}
+			}
+		}
 
 		if (show_all || match) {
 			found = 1;
-			printf("%16s: %s\n", o->name, o->help);
-			if (show_all)
+			if (match)
+				printf("%20s: %s\n", o->name, o->help);
+			if (show_all) {
+				printf("%-20s: %s\n", o->name, o->help);
 				continue;
+			}
 		}
 
 		if (!match)
 			continue;
 
-		printf("%16s: %s\n", "type", typehelp[o->type]);
-		printf("%16s: %s\n", "default", o->def ? o->def : "no default");
-		show_option_range(o);
-		show_option_values(o);
+		show_option_help(o);
 	}
 
 	if (found)
 		return 0;
 
-	printf("No such command: %s\n", name);
+	printf("No such command: %s", name);
+	if (closest) {
+		printf(" - showing closest match\n");
+		printf("%20s: %s\n", closest->name, closest->help);
+		show_option_help(closest);
+	} else
+		printf("\n");
+
 	return 1;
 }
 
@@ -484,6 +641,12 @@ 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)
+			continue;
 		if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
 			fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
 	}