X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=options.c;h=aeba5201e7303a2d83d9e34e7a3110dc0be2f7a4;hb=2c187c0fcaab8a4c6d1ba67d2ad2460b5fb42109;hp=41ecd7fdd0d7818736c609a3108d6268e9c8f3e9;hpb=211097b2aa664b8c157692a1e2fe656ed4a3488c;p=fio.git

diff --git a/options.c b/options.c
index 41ecd7fd..aeba5201 100644
--- a/options.c
+++ b/options.c
@@ -32,12 +32,10 @@ static int str_rw_cb(void *data, const char *str)
 	struct thread_data *td = data;
 	char *nr = get_opt_postfix(str);
 
-	td->o.ddir_nr = 0;
+	td->o.ddir_nr = 1;
 	if (nr)
 		td->o.ddir_nr = atoi(nr);
 
-	printf("ddir_nr=%d\n", td->o.ddir_nr);
-
 	return 0;
 }
 
@@ -248,6 +246,13 @@ static struct fio_option options[] = {
 			  },
 		},
 	},
+	{
+		.name	= "fadvise_hint",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(fadvise_hint),
+		.help	= "Use fadvise() to advise the kernel on IO pattern",
+		.def	= "1",
+	},
 	{
 		.name	= "ioengine",
 		.type	= FIO_OPT_STR_STORE,
@@ -526,8 +531,20 @@ static struct fio_option options[] = {
 			    .oval = VERIFY_MD5,
 			    .help = "Use md5 checksums for verification",
 			  },
+			  {
+			    .ival = "null",
+			    .oval = VERIFY_NULL,
+			    .help = "Pretend to verify",
+			  },
 		},
 	},
+	{
+		.name	= "verifysort",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(verifysort),
+		.help	= "Sort written verify blocks for read back",
+		.def	= "1",
+	},
 	{
 		.name	= "write_iolog",
 		.type	= FIO_OPT_STR_STORE,
@@ -859,3 +876,39 @@ int fio_show_option_help(const char *opt)
 {
 	return show_cmd_help(options, opt);
 }
+
+static void __options_mem(struct thread_data *td, int alloc)
+{
+	struct thread_options *o = &td->o;
+	struct fio_option *opt;
+	char **ptr;
+	int i;
+
+	for (i = 0, opt = &options[0]; opt->name; i++, opt = &options[i]) {
+		if (opt->type != FIO_OPT_STR_STORE)
+			continue;
+
+		ptr = (void *) o + opt->off1;
+		if (*ptr) {
+			if (alloc)
+				*ptr = strdup(*ptr);
+			else {
+				free(*ptr);
+				*ptr = NULL;
+			}
+		}
+	}
+}
+
+/*
+ * dupe FIO_OPT_STR_STORE options
+ */
+void options_mem_dupe(struct thread_data *td)
+{
+	__options_mem(td, 1);
+}
+
+void options_mem_free(struct thread_data *td)
+{
+	__options_mem(td, 0);
+}