X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=options.c;h=8723adff589321729e5501d458174ccdef5ad830;hb=721938ae7fae0f6d470a7e32e177ea5dce480229;hp=3c37e9105698cbabb0f46d66816de93762d8cd3e;hpb=3c48c2c1c702047f8a92fa21fdd1471781b9dab4;p=fio.git

diff --git a/options.c b/options.c
index 3c37e910..8723adff 100644
--- a/options.c
+++ b/options.c
@@ -12,7 +12,7 @@
 
 #include "fio.h"
 #include "parse.h"
-#include "fls.h"
+#include "lib/fls.h"
 
 #define td_var_offset(var)	((size_t) &((struct thread_options *)0)->var)
 
@@ -463,6 +463,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(filename),
 		.cb	= str_filename_cb,
+		.prio	= 1, /* must come before "directory" */
 		.help	= "File(s) to use for the workload",
 	},
 	{
@@ -612,6 +613,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "iodepth_batch",
+		.alias	= "iodepth_batch_submit",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(iodepth_batch),
 		.help	= "Number of IO to submit in one go",
@@ -619,6 +621,15 @@ static struct fio_option options[] = {
 		.minval	= 1,
 		.def	= "1",
 	},
+	{
+		.name	= "iodepth_batch_complete",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(iodepth_batch_complete),
+		.help	= "Number of IO to retrieve in one go",
+		.parent	= "iodepth",
+		.minval	= 0,
+		.def	= "1",
+	},
 	{
 		.name	= "iodepth_low",
 		.type	= FIO_OPT_INT,
@@ -713,7 +724,7 @@ static struct fio_option options[] = {
 		.name	= "softrandommap",
 		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(softrandommap),
-		.help	= "Allow randommap to fail and continue witout",
+		.help	= "Set norandommap if randommap allocation fails",
 		.parent	= "norandommap",
 		.def	= "0",
 	},
@@ -820,6 +831,12 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(time_based),
 		.help	= "Keep running until runtime/timeout is met",
 	},
+	{
+		.name	= "ramp_time",
+		.type	= FIO_OPT_STR_VAL_TIME,
+		.off1	= td_var_offset(ramp_time),
+		.help	= "Ramp up time before measuring performance",
+	},
 	{
 		.name	= "mem",
 		.alias	= "iomem",
@@ -878,6 +895,14 @@ static struct fio_option options[] = {
 			    .oval = VERIFY_CRC32,
 			    .help = "Use crc32 checksums for verification",
 			  },
+			  { .ival = "crc32c-intel",
+			    .oval = VERIFY_CRC32C_INTEL,
+			    .help = "Use hw crc32c checksums for verification",
+			  },
+			  { .ival = "crc32c",
+			    .oval = VERIFY_CRC32C,
+			    .help = "Use crc32c checksums for verification",
+			  },
 			  { .ival = "crc16",
 			    .oval = VERIFY_CRC16,
 			    .help = "Use crc16 checksums for verification",
@@ -1261,7 +1286,7 @@ static struct fio_option options[] = {
 		.name	= "disk_util",
 		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(do_disk_util),
-		.help	= "Log disk utilization stats",
+		.help	= "Log disk utilization statistics",
 		.def	= "1",
 	},
 #endif
@@ -1296,9 +1321,16 @@ void fio_options_dup_and_init(struct option *long_options)
 	}
 }
 
-int fio_option_parse(struct thread_data *td, const char *opt)
+int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
 {
-	return parse_option(opt, options, td);
+	int i, ret;
+
+	sort_options(opts, options, num_opts);
+
+	for (ret = 0, i = 0; i < num_opts; i++)
+		ret |= parse_option(opts[i], options, td);
+
+	return ret;
 }
 
 int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val)