X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=0e8cd5ff1454f53309cc260019d7b3d27e898a7e;hp=886bde6b0c8b1130050234b40c7d047df602cba4;hb=ec1aee01a92f2e390d7ca14d26eebf6453780c53;hpb=03b74b3ec5268e731ed7fcaef31c8c0655acd530

diff --git a/parse.c b/parse.c
index 886bde6b..0e8cd5ff 100644
--- a/parse.c
+++ b/parse.c
@@ -11,6 +11,35 @@
 
 #include "parse.h"
 
+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)
+{
+	const char *msg;
+	int i = 0;
+
+	do {
+		msg = o->posval[i].ival;
+		if (!msg)
+			break;
+
+		if (!i)
+			printf("%20s: ", "valid values");
+
+		printf("%s,", msg);
+		i++;
+	} while (i < PARSE_MAX_VP);
+
+	if (i)
+		printf("\n");
+}
+
 static unsigned long get_mult_time(char c)
 {
 	switch (c) {
@@ -40,6 +69,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 +88,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;
 
@@ -127,15 +159,13 @@ static int check_int(const char *p, int *val)
 static struct fio_option *find_option(struct fio_option *options,
 				      const char *opt)
 {
-	struct fio_option *o = &options[0];
+	struct fio_option *o;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++) {
 		if (!strcmp(o->name, opt))
 			return o;
 		else if (o->alias && !strcmp(o->alias, opt))
 			return o;
-
-		o++;
 	}
 
 	return NULL;
@@ -164,8 +194,27 @@ 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;
+		int i;
 
-		ret = fn(data, ptr);
+		ret = 1;
+		for (i = 0; i < PARSE_MAX_VP; i++) {
+			vp = &o->posval[i];
+			if (!vp->ival || vp->ival[0] == '\0')
+				break;
+			if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
+				ret = 0;
+				if (!o->off1)
+					break;
+				val_store(ilp, vp->oval, o->off1, data);
+				break;
+			}
+		}
+
+		if (ret)
+			show_option_values(o);
+		else if (fn)
+			ret = fn(data, ptr);
 		break;
 	}
 	case FIO_OPT_STR_VAL_TIME:
@@ -220,8 +269,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
 		p1 = strchr(tmp, '-');
 		if (!p1) {
-			ret = 1;
-			break;
+			p1 = strchr(tmp, ':');
+			if (!p1) {
+				ret = 1;
+				break;
+			}
 		}
 
 		p2 = p1 + 1;
@@ -267,6 +319,9 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			return 1;
 		}
 
+		if (o->neg)
+			il = !il;
+
 		if (fn)
 			ret = fn(data, &il);
 		else {
@@ -308,8 +363,11 @@ 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)) {
 		ptr2 = strchr(ptr, ',');
+		if (!ptr2)
+			ptr2 = strchr(ptr, ':');
+	}
 
 	/*
 	 * Don't return early if parsing the first option fails - if
@@ -377,42 +435,9 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
 	return 1;
 }
 
-static void show_option_range(struct fio_option *o)
-{
-	if (!o->minval && !o->maxval)
-		return;
-
-	printf("%16s: min=%d, max=%d\n", "range", o->minval, o->maxval);
-}
-
-static void show_option_values(struct fio_option *o)
-{
-	const char *msg;
-	int i = 0;
-
-	if (!o->posval)
-		return;
-
-	do {
-		msg = o->posval[i];
-		if (!msg)
-			break;
-
-		if (!i)
-			printf("%16s: ", "valid values");
-
-		printf("%s,", msg);
-		i++;
-	} while (1);
-
-	if (i)
-		printf("\n");
-}
-
 int show_cmd_help(struct fio_option *options, const char *name)
 {
 	int show_all = !strcmp(name, "all");
-	struct fio_option *o = &options[0];
 	const char *typehelp[] = {
 		"string (opt=bla)",
 		"string with possible k/m/g postfix (opt=4k)",
@@ -424,23 +449,26 @@ int show_cmd_help(struct fio_option *options, const char *name)
 		"boolean value (opt=1)",
 		"no argument (opt)",
 	};
+	struct fio_option *o;
 	int found = 0;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++) {
 		int match = !strcmp(name, o->name);
 
 		if (show_all || match) {
 			found = 1;
-			printf("%16s: %s\n", o->name, o->help);
-			if (match) {
-				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);
-			}
+			printf("%20s: %s\n", o->name, o->help);
+			if (show_all)
+				continue;
 		}
 
-		o++;
+		if (!match)
+			continue;
+
+		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);
 	}
 
 	if (found)
@@ -455,28 +483,31 @@ int show_cmd_help(struct fio_option *options, const char *name)
  */
 void fill_default_options(void *data, struct fio_option *options)
 {
-	struct fio_option *o = &options[0];
+	struct fio_option *o;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++)
 		if (o->def)
 			handle_option(o, o->def, data);
-		o++;
-	}
 }
 
 /*
  * Sanitize the options structure. For now it just sets min/max for bool
- * values.
+ * values and whether both callback and offsets are given.
  */
 void options_init(struct fio_option *options)
 {
-	struct fio_option *o = &options[0];
+	struct fio_option *o;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++) {
 		if (o->type == FIO_OPT_BOOL) {
 			o->minval = 0;
 			o->maxval = 1;
 		}
-		o++;
+		if (!o->cb && !o->off1)
+			fprintf(stderr, "Option %s: neither cb nor offset given\n", o->name);
+		if (o->type == FIO_OPT_STR)
+			continue;
+		if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
+			fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
 	}
 }