X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=parse.c;h=6141c91e8d31c4e9d0822fb769f606e1bcd84b00;hb=5e4c7118da52cb62aa9361dcac16c68001813cb9;hp=927f78bd97bf3d8db4953781bc60b158a11fe731;hpb=22754746e5dc2552f0c7b995a2095b5723119784;p=fio.git

diff --git a/parse.c b/parse.c
index 927f78bd..6141c91e 100644
--- a/parse.c
+++ b/parse.c
@@ -49,7 +49,7 @@ static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
 static void show_option_range(struct fio_option *o,
 				int (*logger)(const char *format, ...))
 {
-	if (o->type == FIO_OPT_FLOAT_LIST){
+	if (o->type == FIO_OPT_FLOAT_LIST) {
 		if (o->minfp == DBL_MIN && o->maxfp == DBL_MAX)
 			return;
 
@@ -57,7 +57,7 @@ static void show_option_range(struct fio_option *o,
 		if (o->maxfp != DBL_MAX)
 			logger(", max=%f", o->maxfp);
 		logger("\n");
-	} else {
+	} else if (!o->posval[0].ival) {
 		if (!o->minval && !o->maxval)
 			return;
 
@@ -285,7 +285,7 @@ int check_str_bytes(const char *p, long long *val, void *data)
 	return str_to_decimal(p, val, 1, data);
 }
 
-static int check_str_time(const char *p, long long *val)
+int check_str_time(const char *p, long long *val)
 {
 	return str_to_decimal(p, val, 0, NULL);
 }
@@ -380,7 +380,7 @@ static int str_match_len(const struct value_pair *vp, const char *str)
 static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			   int first, int more, int curr)
 {
-	int il, *ilp;
+	int il=0, *ilp;
 	fio_fp64_t *flp;
 	long long ull, *ullp;
 	long ul1, ul2;
@@ -451,6 +451,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		else
 			ret = check_str_bytes(tmp, &ull, data);
 
+		dprint(FD_PARSE, "  ret=%d, out=%llu\n", ret, ull);
+
 		if (ret)
 			break;
 
@@ -545,9 +547,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			** Initialize precision to 0 and zero out list
 			** in case specified list is shorter than default
 			*/
-			ul2 = 0;
-			ilp = td_var(data, o->off2);
-			*ilp = ul2;
+			if (o->off2) {
+				ul2 = 0;
+				ilp = td_var(data, o->off2);
+				*ilp = ul2;
+			}
 
 			flp = td_var(data, o->off1);
 			for(i = 0; i < o->maxlen; i++)
@@ -576,6 +580,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		flp = td_var(data, o->off1);
 		flp[curr].u.f = uf;
 
+		dprint(FD_PARSE, "  out=%f\n", uf);
+
 		/*
 		** Calculate precision for output by counting
 		** number of digits after period. Find first
@@ -588,9 +594,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			while (*++cp2 != '\0' && *cp2 >= '0' && *cp2 <= '9')
 				len++;
 
-			ilp = td_var(data, o->off2);
-			if (len > *ilp)
-				*ilp = len;
+			if (o->off2) {
+				ilp = td_var(data, o->off2);
+				if (len > *ilp)
+					*ilp = len;
+			}
 		}
 
 		break;
@@ -745,6 +753,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		else
 			il = 1;
 
+		dprint(FD_PARSE, "  ret=%d, out=%d\n", ret, il);
+
 		if (ret)
 			break;
 
@@ -782,6 +792,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 	}
 	case FIO_OPT_DEPRECATED:
 		log_info("Option %s is deprecated\n", o->name);
+		ret = 1;
 		break;
 	default:
 		log_err("Bad option type %u\n", o->type);
@@ -937,7 +948,8 @@ int parse_cmd_option(const char *opt, const char *val,
 }
 
 int parse_option(char *opt, const char *input,
-		 struct fio_option *options, struct fio_option **o, void *data)
+		 struct fio_option *options, struct fio_option **o, void *data,
+		 int dump_cmdline)
 {
 	char *post;
 
@@ -958,11 +970,25 @@ int parse_option(char *opt, const char *input,
 		return 1;
 	}
 
-	if (!handle_option(*o, post, data))
-		return 0;
+	if (handle_option(*o, post, data)) {
+		log_err("fio: failed parsing %s\n", input);
+		return 1;
+	}
 
-	log_err("fio: failed parsing %s\n", input);
-	return 1;
+	if (dump_cmdline) {
+		const char *delim;
+
+		if (!strcmp("description", (*o)->name))
+			delim = "\"";
+		else
+			delim = "";
+
+		log_info("--%s%s", (*o)->name, post ? "" : " ");
+		if (post)
+			log_info("=%s%s%s ", delim, post, delim);
+	}
+
+	return 0;
 }
 
 /*
@@ -1080,6 +1106,8 @@ int show_cmd_help(struct fio_option *options, const char *name)
 			continue;
 		if (!exec_profile && o->prof_name)
 			continue;
+		if (exec_profile && !(o->prof_name && !strcmp(exec_profile, o->prof_name)))
+			continue;
 
 		if (name) {
 			if (!strcmp(name, o->name) ||
@@ -1169,8 +1197,9 @@ void option_init(struct fio_option *o)
 	if (!o->cb && (!o->off1 && !o->roff1))
 		log_err("Option %s: neither cb nor offset given\n", o->name);
 	if (!o->category) {
-		log_info("Options %s: no category defined. Setting to misc\n", o->name);
+		log_info("Option %s: no category defined. Setting to misc\n", o->name);
 		o->category = FIO_OPT_C_GENERAL;
+		o->group = FIO_OPT_G_INVALID;
 	}
 	if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE ||
 	    o->type == FIO_OPT_STR_MULTI)