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

diff --git a/parse.c b/parse.c
index 12f76979..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,23 +56,24 @@ 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)
 		*val *= get_mult_bytes(str[len - 1]);
 	else
 		*val *= get_mult_time(str[len - 1]);
+
 	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);
 }
@@ -95,10 +96,13 @@ 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;
 
+	if (!strlen(str))
+		return 1;
+
 	if (sscanf(str, "%lu%c", val, &suffix) == 2) {
 		*val *= get_mult_bytes(suffix);
 		return 0;
@@ -110,8 +114,10 @@ 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;
 	if (sscanf(p, "%u", val) == 1)
 		return 0;
 
@@ -126,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++;
 	}
@@ -140,14 +148,19 @@ static struct fio_option *find_option(struct fio_option *options,
 	} while (0)
 
 static int __handle_option(struct fio_option *o, const char *ptr, void *data,
-			   int first)
+			   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;
 
+	if (!ptr && o->type != FIO_OPT_STR_SET) {
+		fprintf(stderr, "Option %s requires an argument\n", o->name);
+		return 1;
+	}
+
 	switch (o->type) {
 	case FIO_OPT_STR: {
 		fio_opt_str_fn *fn = o->cb;
@@ -169,8 +182,14 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		if (ret)
 			break;
 
-		if (o->max_val && ull > o->max_val)
-			ull = o->max_val;
+		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);
@@ -178,12 +197,12 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			if (o->type == FIO_OPT_STR_VAL_INT) {
 				if (first)
 					val_store(ilp, ull, o->off1, data);
-				if (o->off2)
+				if (!more && o->off2)
 					val_store(ilp, ull, o->off2, data);
 			} else {
 				if (first)
 					val_store(ullp, ull, o->off1, data);
-				if (o->off2)
+				if (!more && o->off2)
 					val_store(ullp, ull, o->off2, data);
 			}
 		}
@@ -223,7 +242,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 				val_store(ilp, ul1, o->off1, data);
 				val_store(ilp, ul2, o->off2, data);
 			}
-			if (o->off3 && o->off4) {
+			if (!more && o->off3 && o->off4) {
 				val_store(ilp, ul1, o->off3, data);
 				val_store(ilp, ul2, o->off4, data);
 			}
@@ -231,22 +250,32 @@ 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->max_val && il > o->max_val)
-			il = o->max_val;
+		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);
 		else {
 			if (first)
 				val_store(ilp, il, o->off1, data);
-			if (o->off2)
+			if (!more && o->off2)
 				val_store(ilp, il, o->off2, data);
 		}
 		break;
@@ -259,13 +288,13 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		else {
 			if (first)
 				val_store(ilp, 1, o->off1, data);
-			if (o->off2)
+			if (!more && o->off2)
 				val_store(ilp, 1, o->off2, data);
 		}
 		break;
 	}
 	default:
-		fprintf(stderr, "Bad option type %d\n", o->type);
+		fprintf(stderr, "Bad option type %u\n", o->type);
 		ret = 1;
 	}
 
@@ -274,22 +303,31 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
 static int handle_option(struct fio_option *o, const char *ptr, void *data)
 {
-	const char *ptr2;
-	int ret;
+	const char *ptr2 = NULL;
+	int r1, r2;
 
-	ret = __handle_option(o, ptr, data, 1);
-	if (ret)
-		return ret;
+	/*
+	 * 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
+	 * copy set 1 options to set 2.
+	 */
+	if (ptr)
+		ptr2 = strchr(ptr, ',');
 
 	/*
-	 * See if we have a second set of parameters, hidden after a comma
+	 * Don't return early if parsing the first option fails - if
+	 * we are doing multiple arguments, we can allow the first one
+	 * being empty.
 	 */
-	ptr2 = strchr(ptr, ',');
+	r1 = __handle_option(o, ptr, data, 1, !!ptr2);
+
 	if (!ptr2)
-		return 0;
+		return r1;
 
 	ptr2++;
-	return __handle_option(o, ptr2, data, 0);
+	r2 = __handle_option(o, ptr2, data, 0, 0);
+
+	return r1 && r2;
 }
 
 int parse_cmd_option(const char *opt, const char *val,
@@ -341,3 +379,107 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
 	fprintf(stderr, "fio: failed parsing %s\n", opt);
 	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)",
+		"string with range and postfix (opt=1k-4k)",
+		"string with time postfix (opt=10s)",
+		"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;
+
+	while (o->name) {
+		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);
+			}
+		}
+
+		o++;
+	}
+
+	if (found)
+		return 0;
+
+	printf("No such command: %s\n", name);
+	return 1;
+}
+
+/*
+ * Handle parsing of default parameters.
+ */
+void fill_default_options(void *data, struct fio_option *options)
+{
+	struct fio_option *o = &options[0];
+
+	while (o->name) {
+		if (o->def)
+			handle_option(o, o->def, data);
+		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++;
+	}
+}