X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=81ffb741094b2ebec9b24e18dff062af2bceced3;hp=102e607ddde58d942e6f2964ebaa50b0410ecfda;hb=76a43db448f9fd5e9f1397428a433466d98e0d5d;hpb=ee738499877bb1ee913e839cb4a8d4edad2d52ad

diff --git a/parse.c b/parse.c
index 102e607d..81ffb741 100644
--- a/parse.c
+++ b/parse.c
@@ -48,7 +48,7 @@ static unsigned long get_mult_bytes(char c)
 /*
  * convert string into decimal value, noting any size suffix
  */
-static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
+static int str_to_decimal(const char *str, long long *val, int kilo)
 {
 	int len;
 
@@ -56,8 +56,8 @@ static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
 	if (!len)
 		return 1;
 
-	*val = strtoul(str, NULL, 10);
-	if (*val == ULONG_MAX && errno == ERANGE)
+	*val = strtol(str, NULL, 10);
+	if (*val == LONG_MAX && errno == ERANGE)
 		return 1;
 
 	if (kilo)
@@ -68,12 +68,12 @@ static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
 	return 0;
 }
 
-static int check_str_bytes(const char *p, unsigned long long *val)
+static int check_str_bytes(const char *p, long long *val)
 {
 	return str_to_decimal(p, val, 1);
 }
 
-static int check_str_time(const char *p, unsigned long long *val)
+static int check_str_time(const char *p, long long *val)
 {
 	return str_to_decimal(p, val, 0);
 }
@@ -96,7 +96,7 @@ void strip_blank_end(char *p)
 	*(s + 1) = '\0';
 }
 
-static int check_range_bytes(const char *str, unsigned long *val)
+static int check_range_bytes(const char *str, long *val)
 {
 	char suffix;
 
@@ -114,7 +114,7 @@ static int check_range_bytes(const char *str, unsigned long *val)
 	return 1;
 }
 
-static int check_int(const char *p, unsigned int *val)
+static int check_int(const char *p, int *val)
 {
 	if (!strlen(p))
 		return 1;
@@ -132,6 +132,8 @@ static struct fio_option *find_option(struct fio_option *options,
 	while (o->name) {
 		if (!strcmp(o->name, opt))
 			return o;
+		else if (o->alias && !strcmp(o->alias, opt))
+			return o;
 
 		o++;
 	}
@@ -148,9 +150,9 @@ static struct fio_option *find_option(struct fio_option *options,
 static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			   int first, int more)
 {
-	unsigned int il, *ilp;
-	unsigned long long ull, *ullp;
-	unsigned long ul1, ul2;
+	int il, *ilp;
+	long long ull, *ullp;
+	long ul1, ul2;
 	char **cp;
 	int ret = 0, is_time = 0;
 
@@ -180,10 +182,14 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		if (ret)
 			break;
 
-		if (o->maxval && ull > o->maxval)
-			ull = o->maxval;
-		if (o->minval && ull < o->minval)
-			ull = o->minval;
+		if (o->maxval && ull > o->maxval) {
+			fprintf(stderr, "max value out of range: %lld (%d max)\n", ull, o->maxval);
+			return 1;
+		}
+		if (o->minval && ull < o->minval) {
+			fprintf(stderr, "min value out of range: %lld (%d min)\n", ull, o->minval);
+			return 1;
+		}
 
 		if (fn)
 			ret = fn(data, &ull);
@@ -244,17 +250,25 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
 		break;
 	}
-	case FIO_OPT_INT: {
+	case FIO_OPT_INT:
+	case FIO_OPT_BOOL: {
 		fio_opt_int_fn *fn = o->cb;
 
 		ret = check_int(ptr, &il);
 		if (ret)
 			break;
 
-		if (o->maxval && il > o->maxval)
-			il = o->maxval;
-		if (o->minval && il < o->minval)
-			il = o->minval;
+		if (o->maxval && il > (int) o->maxval) {
+			fprintf(stderr, "max value out of range: %d (%d max)\n", il, o->maxval);
+			return 1;
+		}
+		if (o->minval && il < o->minval) {
+			fprintf(stderr, "min value out of range: %d (%d min)\n", il, o->minval);
+			return 1;
+		}
+
+		if (o->neg)
+			il = !il;
 
 		if (fn)
 			ret = fn(data, &il);
@@ -366,6 +380,38 @@ 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");
@@ -378,6 +424,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
 		"string (opt=bla)",
 		"string with dual range (opt=1k-4k,4k-8k)",
 		"integer value (opt=100)",
+		"boolean value (opt=1)",
 		"no argument (opt)",
 	};
 	int found = 0;
@@ -387,13 +434,12 @@ int show_cmd_help(struct fio_option *options, const char *name)
 
 		if (show_all || match) {
 			found = 1;
-			printf("%s: %s\n", o->name, o->help);
+			printf("%16s: %s\n", o->name, o->help);
 			if (match) {
-				printf("type: %s\n", typehelp[o->type]);
-				if (o->def)
-					printf("default: %s\n", o->def);
-				else
-					printf("defaults: no default\n");
+				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);
 			}
 		}
 
@@ -407,6 +453,9 @@ int show_cmd_help(struct fio_option *options, const char *name)
 	return 1;
 }
 
+/*
+ * Handle parsing of default parameters.
+ */
 void fill_default_options(void *data, struct fio_option *options)
 {
 	struct fio_option *o = &options[0];
@@ -417,3 +466,20 @@ void fill_default_options(void *data, struct fio_option *options)
 		o++;
 	}
 }
+
+/*
+ * Sanitize the options structure. For now it just sets min/max for bool
+ * values.
+ */
+void options_init(struct fio_option *options)
+{
+	struct fio_option *o = &options[0];
+
+	while (o->name) {
+		if (o->type == FIO_OPT_BOOL) {
+			o->minval = 0;
+			o->maxval = 1;
+		}
+		o++;
+	}
+}