X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=81ffb741094b2ebec9b24e18dff062af2bceced3;hp=82cdf8a78b5a23004630c51f45bc1af9b37ed5b5;hb=76a43db448f9fd5e9f1397428a433466d98e0d5d;hpb=cb2c86fdf03241fee32fd2e2caff43af1022403c;ds=sidebyside

diff --git a/parse.c b/parse.c
index 82cdf8a7..81ffb741 100644
--- a/parse.c
+++ b/parse.c
@@ -46,44 +46,35 @@ static unsigned long get_mult_bytes(char c)
 }
 
 /*
- * convert string after '=' into decimal value, noting any size suffix
+ * convert string into decimal value, noting any size suffix
  */
-static int str_to_decimal(char *p, unsigned long long *val, int kilo)
+static int str_to_decimal(const char *str, long long *val, int kilo)
 {
-	char *str;
 	int len;
 
-	str = strchr(p, '=');
-	if (!str)
-		return 1;
-
-	str++;
 	len = strlen(str);
+	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;
 }
 
-int check_str_bytes(char *p, char *name, unsigned long long *val)
+static int check_str_bytes(const char *p, long long *val)
 {
-	if (strncmp(p, name, strlen(name) - 1))
-		return 1;
-
 	return str_to_decimal(p, val, 1);
 }
 
-int check_str_time(char *p, char *name, unsigned long long *val)
+static int check_str_time(const char *p, long long *val)
 {
-	if (strncmp(p, name, strlen(name) - 1))
-		return 1;
-
 	return str_to_decimal(p, val, 0);
 }
 
@@ -105,130 +96,390 @@ void strip_blank_end(char *p)
 	*(s + 1) = '\0';
 }
 
-int check_str(char *p, char *name, str_cb_fn *cb, void *data)
+static int check_range_bytes(const char *str, long *val)
 {
-	char *s;
+	char suffix;
 
-	if (strncmp(p, name, strlen(name)))
+	if (!strlen(str))
 		return 1;
 
-	s = strstr(p, name);
-	if (!s)
-		return 1;
+	if (sscanf(str, "%lu%c", val, &suffix) == 2) {
+		*val *= get_mult_bytes(suffix);
+		return 0;
+	}
 
-	s = strchr(s, '=');
-	if (!s)
-		return 1;
+	if (sscanf(str, "%lu", val) == 1)
+		return 0;
 
-	s++;
-	strip_blank_front(&s);
-	return cb(data, s);
+	return 1;
 }
 
-int check_strstore(char *p, char *name, char *dest)
+static int check_int(const char *p, int *val)
 {
-	char *s;
-
-	if (strncmp(p, name, strlen(name)))
-		return 1;
-
-	s = strstr(p, name);
-	if (!s)
+	if (!strlen(p))
 		return 1;
+	if (sscanf(p, "%u", val) == 1)
+		return 0;
 
-	s = strchr(p, '=');
-	if (!s)
-		return 1;
-
-	s++;
-	strip_blank_front(&s);
-
-	strcpy(dest, s);
-	return 0;
+	return 1;
 }
 
-static int __check_range_bytes(char *str, unsigned long *val)
+static struct fio_option *find_option(struct fio_option *options,
+				      const char *opt)
 {
-	char suffix;
+	struct fio_option *o = &options[0];
 
-	if (sscanf(str, "%lu%c", val, &suffix) == 2) {
-		*val *= get_mult_bytes(suffix);
-		return 0;
-	}
+	while (o->name) {
+		if (!strcmp(o->name, opt))
+			return o;
+		else if (o->alias && !strcmp(o->alias, opt))
+			return o;
 
-	if (sscanf(str, "%lu", val) == 1)
-		return 0;
+		o++;
+	}
 
-	return 1;
+	return NULL;
 }
 
-int check_range_bytes(char *p, char *name, unsigned long *s, unsigned long *e)
-{
-	char option[128];
-	char *str, *p1, *p2;
+#define val_store(ptr, val, off, data)			\
+	do {						\
+		ptr = td_var((data), (off));		\
+		*ptr = (val);				\
+	} while (0)
 
-	if (strncmp(p, name, strlen(name)))
+static int __handle_option(struct fio_option *o, const char *ptr, void *data,
+			   int first, int more)
+{
+	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;
+	}
 
-	strcpy(option, p);
-	p = option;
+	switch (o->type) {
+	case FIO_OPT_STR: {
+		fio_opt_str_fn *fn = o->cb;
 
-	str = strstr(p, name);
-	if (!str)
-		return 1;
+		ret = fn(data, ptr);
+		break;
+	}
+	case FIO_OPT_STR_VAL_TIME:
+		is_time = 1;
+	case FIO_OPT_STR_VAL:
+	case FIO_OPT_STR_VAL_INT: {
+		fio_opt_str_val_fn *fn = o->cb;
+
+		if (is_time)
+			ret = check_str_time(ptr, &ull);
+		else
+			ret = check_str_bytes(ptr, &ull);
+
+		if (ret)
+			break;
+
+		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);
+		else {
+			if (o->type == FIO_OPT_STR_VAL_INT) {
+				if (first)
+					val_store(ilp, ull, o->off1, data);
+				if (!more && o->off2)
+					val_store(ilp, ull, o->off2, data);
+			} else {
+				if (first)
+					val_store(ullp, ull, o->off1, data);
+				if (!more && o->off2)
+					val_store(ullp, ull, o->off2, data);
+			}
+		}
+		break;
+	}
+	case FIO_OPT_STR_STORE:
+		cp = td_var(data, o->off1);
+		*cp = strdup(ptr);
+		break;
+	case FIO_OPT_RANGE: {
+		char tmp[128];
+		char *p1, *p2;
+
+		strncpy(tmp, ptr, sizeof(tmp) - 1);
+
+		p1 = strchr(tmp, '-');
+		if (!p1) {
+			ret = 1;
+			break;
+		}
+
+		p2 = p1 + 1;
+		*p1 = '\0';
+		p1 = tmp;
+
+		ret = 1;
+		if (!check_range_bytes(p1, &ul1) && !check_range_bytes(p2, &ul2)) {
+			ret = 0;
+			if (ul1 > ul2) {
+				unsigned long foo = ul1;
+
+				ul1 = ul2;
+				ul2 = foo;
+			}
+
+			if (first) {
+				val_store(ilp, ul1, o->off1, data);
+				val_store(ilp, ul2, o->off2, data);
+			}
+			if (!more && o->off3 && o->off4) {
+				val_store(ilp, ul1, o->off3, data);
+				val_store(ilp, ul2, o->off4, data);
+			}
+		}
+
+		break;
+	}
+	case FIO_OPT_INT:
+	case FIO_OPT_BOOL: {
+		fio_opt_int_fn *fn = o->cb;
 
-	p += strlen(name);
+		ret = check_int(ptr, &il);
+		if (ret)
+			break;
 
-	str = strchr(p, '=');
-	if (!str)
-		return 1;
+		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 (!more && o->off2)
+				val_store(ilp, il, o->off2, data);
+		}
+		break;
+	}
+	case FIO_OPT_STR_SET: {
+		fio_opt_str_set_fn *fn = o->cb;
+
+		if (fn)
+			ret = fn(data);
+		else {
+			if (first)
+				val_store(ilp, 1, o->off1, data);
+			if (!more && o->off2)
+				val_store(ilp, 1, o->off2, data);
+		}
+		break;
+	}
+	default:
+		fprintf(stderr, "Bad option type %u\n", o->type);
+		ret = 1;
+	}
+
+	return ret;
+}
+
+static int handle_option(struct fio_option *o, const char *ptr, void *data)
+{
+	const char *ptr2 = NULL;
+	int r1, r2;
 
 	/*
-	 * 'p' now holds whatever is after the '=' sign
+	 * 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.
 	 */
-	p1 = str + 1;
+	if (ptr)
+		ptr2 = strchr(ptr, ',');
 
 	/*
-	 * terminate p1 at the '-' sign
+	 * Don't return early if parsing the first option fails - if
+	 * we are doing multiple arguments, we can allow the first one
+	 * being empty.
 	 */
-	p = strchr(p1, '-');
-	if (!p)
-		return 1;
+	r1 = __handle_option(o, ptr, data, 1, !!ptr2);
+
+	if (!ptr2)
+		return r1;
+
+	ptr2++;
+	r2 = __handle_option(o, ptr2, data, 0, 0);
+
+	return r1 && r2;
+}
+
+int parse_cmd_option(const char *opt, const char *val,
+		     struct fio_option *options, void *data)
+{
+	struct fio_option *o;
 
-	p2 = p + 1;
-	*p = '\0';
+	o = find_option(options, opt);
+	if (!o) {
+		fprintf(stderr, "Bad option %s\n", opt);
+		return 1;
+	}
 
-	if (!__check_range_bytes(p1, s) && !__check_range_bytes(p2, e))
+	if (!handle_option(o, val, data))
 		return 0;
 
+	fprintf(stderr, "fio: failed parsing %s=%s\n", opt, val);
 	return 1;
 }
 
-int check_int(char *p, char *name, unsigned int *val)
+int parse_option(const char *opt, struct fio_option *options, void *data)
 {
-	char *str;
+	struct fio_option *o;
+	char *pre, *post;
+	char tmp[64];
+
+	strncpy(tmp, opt, sizeof(tmp) - 1);
+
+	pre = strchr(tmp, '=');
+	if (pre) {
+		post = pre;
+		*pre = '\0';
+		pre = tmp;
+		post++;
+		o = find_option(options, pre);
+	} else {
+		o = find_option(options, tmp);
+		post = NULL;
+	}
 
-	if (strncmp(p, name, strlen(name)))
+	if (!o) {
+		fprintf(stderr, "Bad option %s\n", tmp);
 		return 1;
+	}
 
-	str = strstr(p, name);
-	if (!str)
-		return 1;
+	if (!handle_option(o, post, data))
+		return 0;
 
-	str = strchr(p, '=');
-	if (!str)
-		return 1;
+	fprintf(stderr, "fio: failed parsing %s\n", opt);
+	return 1;
+}
 
-	str++;
+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;
 
-	if (sscanf(str, "%u", val) == 1)
+	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;
 }
 
-int check_strset(char *p, char *name)
+/*
+ * Handle parsing of default parameters.
+ */
+void fill_default_options(void *data, struct fio_option *options)
 {
-	return strncmp(p, name, strlen(name));
+	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++;
+	}
+}