X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=f8e89f381bbd171fbed1877066f33c744dd7a6e1;hp=f502247d1eb6323b27a3960ec9e20b01ffa2c9ae;hb=b5605e9ded4188ed91faae1a43ecd333a9856f62;hpb=4e991c23d2d06484f581eb5e2105bc102cb35941

diff --git a/options.c b/options.c
index f502247d..f8e89f38 100644
--- a/options.c
+++ b/options.c
@@ -9,7 +9,7 @@
 #include "fio.h"
 #include "parse.h"
 
-#define td_var_offset(var)	((size_t) &((struct thread_data *)0)->var)
+#define td_var_offset(var)	((size_t) &((struct thread_options *)0)->var)
 
 /*
  * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
@@ -27,13 +27,25 @@ static char *get_opt_postfix(const char *str)
 	return strdup(p);
 }
 
+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 = 1;
+	if (nr)
+		td->o.ddir_nr = atoi(nr);
+
+	return 0;
+}
+
 static int str_mem_cb(void *data, const char *mem)
 {
 	struct thread_data *td = data;
 
-	if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
+	if (td->o.mem_type == MEM_MMAPHUGE || td->o.mem_type == MEM_MMAP) {
 		td->mmapfile = get_opt_postfix(mem);
-		if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
+		if (td->o.mem_type == MEM_MMAPHUGE && !td->mmapfile) {
 			log_err("fio: mmaphuge:/path/to/file\n");
 			return 1;
 		}
@@ -90,7 +102,7 @@ static int str_cpumask_cb(void *data, unsigned int *val)
 {
 	struct thread_data *td = data;
 
-	fill_cpu_mask(td->cpumask, *val);
+	fill_cpu_mask(td->o.cpumask, *val);
 	return 0;
 }
 
@@ -117,13 +129,13 @@ static int str_filename_cb(void *data, const char *input)
 	strip_blank_end(str);
 
 	if (!td->files_index)
-		td->nr_files = 0;
+		td->o.nr_files = 0;
 
 	while ((fname = strsep(&str, ":")) != NULL) {
 		if (!strlen(fname))
 			break;
 		add_file(td, fname);
-		td->nr_files++;
+		td->o.nr_files++;
 	}
 
 	free(p);
@@ -135,13 +147,13 @@ static int str_directory_cb(void *data, const char fio_unused *str)
 	struct thread_data *td = data;
 	struct stat sb;
 
-	if (lstat(td->directory, &sb) < 0) {
-		log_err("fio: %s is not a directory\n", td->directory);
+	if (lstat(td->o.directory, &sb) < 0) {
+		log_err("fio: %s is not a directory\n", td->o.directory);
 		td_verror(td, errno, "lstat");
 		return 1;
 	}
 	if (!S_ISDIR(sb.st_mode)) {
-		log_err("fio: %s is not a directory\n", td->directory);
+		log_err("fio: %s is not a directory\n", td->o.directory);
 		return 1;
 	}
 
@@ -153,9 +165,9 @@ static int str_opendir_cb(void *data, const char fio_unused *str)
 	struct thread_data *td = data;
 
 	if (!td->files_index)
-		td->nr_files = 0;
+		td->o.nr_files = 0;
 
-	return add_dir_files(td, td->opendir);
+	return add_dir_files(td, td->o.opendir);
 }
 
 
@@ -201,7 +213,9 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "rw",
+		.alias	= "readwrite",
 		.type	= FIO_OPT_STR,
+		.cb	= str_rw_cb,
 		.off1	= td_var_offset(td_ddir),
 		.help	= "IO direction",
 		.def	= "read",
@@ -232,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,
@@ -279,6 +300,11 @@ static struct fio_option options[] = {
 			  { .ival = "cpuio",
 			    .help = "CPU cycler burner engine",
 			  },
+#ifdef FIO_HAVE_GUASI
+			  { .ival = "guasi",
+			    .help = "GUASI IO engine",
+			  },
+#endif
 			  { .ival = "external",
 			    .help = "Load external engine (append name)",
 			  },
@@ -306,7 +332,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "size",
 		.type	= FIO_OPT_STR_VAL,
-		.off1	= td_var_offset(total_file_size),
+		.off1	= td_var_offset(size),
 		.help	= "Total size of device or files",
 	},
 	{
@@ -318,6 +344,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "bs",
+		.alias	= "blocksize",
 		.type	= FIO_OPT_STR_VAL_INT,
 		.off1	= td_var_offset(bs[DDIR_READ]),
 		.off2	= td_var_offset(bs[DDIR_WRITE]),
@@ -326,6 +353,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "bsrange",
+		.alias	= "blocksize_range",
 		.type	= FIO_OPT_RANGE,
 		.off1	= td_var_offset(min_bs[DDIR_READ]),
 		.off2	= td_var_offset(max_bs[DDIR_READ]),
@@ -335,6 +363,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "bs_unaligned",
+		.alias	= "blocksize_unaligned",
 		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(bs_unaligned),
 		.help	= "Don't sector align IO buffer sizes",
@@ -450,6 +479,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "mem",
+		.alias	= "iomem",
 		.type	= FIO_OPT_STR,
 		.cb	= str_mem_cb,
 		.off1	= td_var_offset(mem_type),
@@ -501,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,
@@ -566,7 +608,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "rwmixread",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rwmixread),
+		.off1	= td_var_offset(rwmix[DDIR_READ]),
 		.maxval	= 100,
 		.help	= "Percentage of mixed workload that is reads",
 		.def	= "50",
@@ -574,7 +616,7 @@ static struct fio_option options[] = {
 	{
 		.name	= "rwmixwrite",
 		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(rwmixwrite),
+		.off1	= td_var_offset(rwmix[DDIR_WRITE]),
 		.maxval	= 100,
 		.help	= "Percentage of mixed workload that is writes",
 		.def	= "50",
@@ -747,6 +789,12 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(stonewall),
 		.help	= "Insert a hard barrier between this job and previous",
 	},
+	{
+		.name	= "new_group",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= td_var_offset(new_group),
+		.help	= "Mark the start of a new group (for reporting)",
+	},
 	{
 		.name	= "thread",
 		.type	= FIO_OPT_STR_SET,
@@ -828,3 +876,41 @@ 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 fio_unused *td)
+{
+#if 0
+	__options_mem(td, 0);
+#endif
+}