X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=options.c;h=394472a4dadf61512e6c49f8495f97f248b357f5;hb=3980127d55c6b1773274bc854aae4589aa3f785a;hp=a45d1af6b7d9f17c316def4b0bfa6d48b515763e;hpb=afad68f778a764cbe57d4a5d54cbea32444aaa45;p=fio.git

diff --git a/options.c b/options.c
index a45d1af6..394472a4 100644
--- a/options.c
+++ b/options.c
@@ -11,6 +11,7 @@
 #include <sys/stat.h>
 
 #include "fio.h"
+#include "verify.h"
 #include "parse.h"
 #include "lib/fls.h"
 
@@ -812,7 +813,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "bs",
 		.alias	= "blocksize",
-		.type	= FIO_OPT_STR_VAL_INT,
+		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(bs[DDIR_READ]),
 		.off2	= td_var_offset(bs[DDIR_WRITE]),
 		.minval = 1,
@@ -823,7 +824,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "ba",
 		.alias	= "blockalign",
-		.type	= FIO_OPT_STR_VAL_INT,
+		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(ba[DDIR_READ]),
 		.off2	= td_var_offset(ba[DDIR_WRITE]),
 		.minval	= 1,
@@ -930,6 +931,13 @@ static struct fio_option options[] = {
 		.help	= "Issue fsync for writes every given number of blocks",
 		.def	= "0",
 	},
+	{
+		.name	= "fdatasync",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(fdatasync_blocks),
+		.help	= "Issue fdatasync for writes every given number of blocks",
+		.def	= "0",
+	},
 	{
 		.name	= "direct",
 		.type	= FIO_OPT_BOOL,
@@ -1104,7 +1112,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name   = "verify_interval",
-		.type   = FIO_OPT_STR_VAL_INT,
+		.type   = FIO_OPT_INT,
 		.off1   = td_var_offset(verify_interval),
 		.minval	= 2 * sizeof(struct verify_header),
 		.help   = "Store verify buffer header every N bytes",
@@ -1112,7 +1120,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "verify_offset",
-		.type	= FIO_OPT_STR_VAL_INT,
+		.type	= FIO_OPT_INT,
 		.help	= "Offset verify header location by N bytes",
 		.def	= "0",
 		.cb	= str_verify_offset_cb,
@@ -1259,26 +1267,30 @@ static struct fio_option options[] = {
 	{
 		.name	= "rate",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rate),
+		.off1	= td_var_offset(rate[0]),
+		.off2	= td_var_offset(rate[1]),
 		.help	= "Set bandwidth rate",
 	},
 	{
 		.name	= "ratemin",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(ratemin),
+		.off1	= td_var_offset(ratemin[0]),
+		.off2	= td_var_offset(ratemin[1]),
 		.help	= "Job must meet this rate or it will be shutdown",
 		.parent	= "rate",
 	},
 	{
 		.name	= "rate_iops",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rate_iops),
+		.off1	= td_var_offset(rate_iops[0]),
+		.off2	= td_var_offset(rate_iops[1]),
 		.help	= "Limit IO used to this number of IO operations/sec",
 	},
 	{
 		.name	= "rate_iops_min",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rate_iops_min),
+		.off1	= td_var_offset(rate_iops_min[0]),
+		.off2	= td_var_offset(rate_iops_min[1]),
 		.help	= "Job must meet this rate or it will be shutdown",
 		.parent	= "rate_iops",
 	},
@@ -1430,7 +1442,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "hugepage-size",
-		.type	= FIO_OPT_STR_VAL_INT,
+		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(hugepage_size),
 		.help	= "When using hugepages, specify size of each page",
 		.def	= __stringify(FIO_HUGE_PAGE),
@@ -1499,6 +1511,13 @@ static struct fio_option options[] = {
 		.cb	= str_gtod_cpu_cb,
 		.help	= "Setup dedicated gettimeofday() thread on this CPU",
 	},
+	{
+		.name	= "continue_on_error",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(continue_on_error),
+		.help	= "Continue on non-fatal errors during I/O",
+		.def	= "0",
+	},
 	{
 		.name = NULL,
 	},