X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=parse.c;h=ca78f904dd0bd7ef97897fa10446e73ad6fb3279;hb=8b113b4f2975f9edf4542d2e0f6d876dd89d1b8c;hp=3c203121711dcb9595bea3b1b6e517dad3d76abb;hpb=a3d741fa3bc3120d5b62a56826a97524daa32803;p=fio.git

diff --git a/parse.c b/parse.c
index 3c203121..ca78f904 100644
--- a/parse.c
+++ b/parse.c
@@ -70,37 +70,37 @@ static void show_option_values(struct fio_option *o)
 static unsigned long get_mult_time(char c)
 {
 	switch (c) {
-		case 'm':
-		case 'M':
-			return 60;
-		case 'h':
-		case 'H':
-			return 60 * 60;
-		case 'd':
-		case 'D':
-			return 24 * 60 * 60;
-		default:
-			return 1;
+	case 'm':
+	case 'M':
+		return 60;
+	case 'h':
+	case 'H':
+		return 60 * 60;
+	case 'd':
+	case 'D':
+		return 24 * 60 * 60;
+	default:
+		return 1;
 	}
 }
 
 static unsigned long get_mult_bytes(char c)
 {
 	switch (c) {
-		case 'k':
-		case 'K':
-			return 1024;
-		case 'm':
-		case 'M':
-			return 1024 * 1024;
-		case 'g':
-		case 'G':
-			return 1024 * 1024 * 1024;
-		case 'e':
-		case 'E':
-			return 1024 * 1024 * 1024 * 1024UL;
-		default:
-			return 1;
+	case 'k':
+	case 'K':
+		return 1024;
+	case 'm':
+	case 'M':
+		return 1024 * 1024;
+	case 'g':
+	case 'G':
+		return 1024 * 1024 * 1024;
+	case 'e':
+	case 'E':
+		return 1024 * 1024 * 1024 * 1024UL;
+	default:
+		return 1;
 	}
 }
 
@@ -282,11 +282,13 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			break;
 
 		if (o->maxval && ull > o->maxval) {
-			fprintf(stderr, "max value out of range: %lld (%d max)\n", 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);
+			fprintf(stderr, "min value out of range: %lld"
+					" (%d min)\n", ull, o->minval);
 			return 1;
 		}
 
@@ -341,7 +343,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		p1 = tmp;
 
 		ret = 1;
-		if (!check_range_bytes(p1, &ul1) && !check_range_bytes(p2, &ul2)) {
+		if (!check_range_bytes(p1, &ul1) &&
+		    !check_range_bytes(p2, &ul2)) {
 			ret = 0;
 			if (ul1 > ul2) {
 				unsigned long foo = ul1;
@@ -371,11 +374,13 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			break;
 
 		if (o->maxval && il > (int) o->maxval) {
-			fprintf(stderr, "max value out of range: %d (%d max)\n", il, 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);
+			fprintf(stderr, "min value out of range: %d (%d min)\n",
+								il, o->minval);
 			return 1;
 		}
 
@@ -405,6 +410,9 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		}
 		break;
 	}
+	case FIO_OPT_DEPRECATED:
+		fprintf(stdout, "Option %s is deprecated\n", o->name);
+		break;
 	default:
 		fprintf(stderr, "Bad option type %u\n", o->type);
 		ret = 1;
@@ -579,24 +587,49 @@ static struct fio_option *find_child(struct fio_option *options,
 	return NULL;
 }
 
-static void print_option(struct fio_option *o, struct fio_option *org,
-			 int level)
+static void __print_option(struct fio_option *o, struct fio_option *org,
+			   int level)
 {
 	char name[256], *p;
+	int depth;
 
 	if (!o)
 		return;
 	if (!org)
 		org = o;
-	
+
 	p = name;
-	if (level)
-		p += sprintf(p, "%s", "    ");
+	depth = level;
+	while (depth--)
+		p += sprintf(p, "%s", "  ");
 
 	sprintf(p, "%s", o->name);
 
 	printf("%-24s: %s\n", name, o->help);
-	print_option(find_child(o, org), org, level + 1);
+}
+
+static void print_option(struct fio_option *o)
+{
+	struct fio_option *parent;
+	struct fio_option *__o;
+	unsigned int printed;
+	unsigned int level;
+
+	__print_option(o, NULL, 0);
+	parent = o;
+	level = 0;
+	do {
+		level++;
+		printed = 0;
+
+		while ((__o = find_child(o, parent)) != NULL) {
+			__print_option(__o, o, level);
+			o = __o;
+			printed++;
+		}
+
+		parent = o;
+	} while (printed);
 }
 
 int show_cmd_help(struct fio_option *options, const char *name)
@@ -614,6 +647,9 @@ int show_cmd_help(struct fio_option *options, const char *name)
 	for (o = &options[0]; o->name; o++) {
 		int match = 0;
 
+		if (o->type == FIO_OPT_DEPRECATED)
+			continue;
+
 		if (name) {
 			if (!strcmp(name, o->name) ||
 			    (o->alias && !strcmp(name, o->alias)))
@@ -635,7 +671,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
 				printf("%24s: %s\n", o->name, o->help);
 			if (show_all) {
 				if (!o->parent)
-					print_option(o, NULL, 0);
+					print_option(o);
 				continue;
 			}
 		}
@@ -685,17 +721,26 @@ void options_init(struct fio_option *options)
 	dprint(FD_PARSE, "init options\n");
 
 	for (o = &options[0]; o->name; o++) {
+		if (o->type == FIO_OPT_DEPRECATED)
+			continue;
 		if (o->type == FIO_OPT_BOOL) {
 			o->minval = 0;
 			o->maxval = 1;
 		}
-		if (o->type == FIO_OPT_STR_SET && o->def)
-			fprintf(stderr, "Option %s: string set option with default will always be true\n", o->name);
-		if (!o->cb && !o->off1)
-			fprintf(stderr, "Option %s: neither cb nor offset given\n", o->name);
+		if (o->type == FIO_OPT_STR_SET && o->def) {
+			fprintf(stderr, "Option %s: string set option with"
+					" default will always be true\n",
+						o->name);
+		}
+		if (!o->cb && !o->off1) {
+			fprintf(stderr, "Option %s: neither cb nor offset"
+					" given\n", o->name);
+		}
 		if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE)
 			continue;
-		if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
-			fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
+		if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4)) {
+			fprintf(stderr, "Option %s: both cb and offset given\n",
+								 o->name);
+		}
 	}
 }