X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=a064764be0762bc11c1ad345329733d41b5110de;hp=3b04ffae8c129a6828add9cd75a28a22f451b96c;hb=20876c53b5d32f2da9049af5e7fb102133946981;hpb=a4ed0430e4c58291c291dee1e0459fa67893e185

diff --git a/options.c b/options.c
index 3b04ffae..a064764b 100644
--- a/options.c
+++ b/options.c
@@ -168,6 +168,9 @@ static int str_bssplit_cb(void *data, const char *input)
 	char *str, *p, *odir, *ddir;
 	int ret = 0;
 
+	if (parse_dryrun())
+		return 0;
+
 	p = str = strdup(input);
 
 	strip_blank_front(&str);
@@ -271,6 +274,7 @@ static int ignore_error_type(struct thread_data *td, int etype, char *str)
 		if (!error[i]) {
 			log_err("Unknown error %s, please use number value \n",
 				  fname);
+			free(error);
 			return 1;
 		}
 		i++;
@@ -289,6 +293,10 @@ static int str_ignore_error_cb(void *data, const char *input)
 	struct thread_data *td = data;
 	char *str, *p, *n;
 	int type = 0, ret = 1;
+
+	if (parse_dryrun())
+		return 0;
+
 	p = str = strdup(input);
 
 	strip_blank_front(&str);
@@ -314,6 +322,9 @@ static int str_rw_cb(void *data, const char *str)
 	struct thread_options *o = &td->o;
 	char *nr = get_opt_postfix(str);
 
+	if (parse_dryrun())
+		return 0;
+
 	o->ddir_seq_nr = 1;
 	o->ddir_seq_add = 0;
 
@@ -390,6 +401,9 @@ static int str_cpumask_cb(void *data, unsigned long long *val)
 	long max_cpu;
 	int ret;
 
+	if (parse_dryrun())
+		return 0;
+
 	ret = fio_cpuset_init(&td->o.cpumask);
 	if (ret < 0) {
 		log_err("fio: cpuset_init failed\n");
@@ -488,6 +502,9 @@ static int str_cpus_allowed_cb(void *data, const char *input)
 	struct thread_data *td = data;
 	int ret;
 
+	if (parse_dryrun())
+		return 0;
+
 	ret = set_cpus_allowed(td, &td->o.cpumask, input);
 	if (!ret)
 		td->o.cpumask_set = 1;
@@ -513,6 +530,9 @@ static int str_numa_cpunodes_cb(void *data, char *input)
 {
 	struct thread_data *td = data;
 
+	if (parse_dryrun())
+		return 0;
+
 	/* numa_parse_nodestring() parses a character string list
 	 * of nodes into a bit mask. The bit mask is allocated by
 	 * numa_allocate_nodemask(), so it should be freed by
@@ -533,10 +553,14 @@ static int str_numa_mpol_cb(void *data, char *input)
 {
 	struct thread_data *td = data;
 	const char * const policy_types[] =
-		{ "default", "prefer", "bind", "interleave", "local" };
+		{ "default", "prefer", "bind", "interleave", "local", NULL };
 	int i;
+	char *nodelist;
+
+	if (parse_dryrun())
+		return 0;
 
-	char *nodelist = strchr(input, ':');
+	nodelist = strchr(input, ':');
 	if (nodelist) {
 		/* NUL-terminate mode */
 		*nodelist++ = '\0';
@@ -668,6 +692,9 @@ static int str_random_distribution_cb(void *data, const char *str)
 	double val;
 	char *nr;
 
+	if (parse_dryrun())
+		return 0;
+
 	if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
 		val = 1.1;
 	else if (td->o.random_distribution == FIO_RAND_DIST_PARETO)
@@ -776,6 +803,9 @@ static int str_directory_cb(void *data, const char fio_unused *str)
 	struct thread_data *td = data;
 	struct stat sb;
 
+	if (parse_dryrun())
+		return 0;
+
 	if (lstat(td->o.directory, &sb) < 0) {
 		int ret = errno;
 
@@ -795,6 +825,9 @@ static int str_opendir_cb(void *data, const char fio_unused *str)
 {
 	struct thread_data *td = data;
 
+	if (parse_dryrun())
+		return 0;
+
 	if (!td->files_index)
 		td->o.nr_files = 0;
 
@@ -805,7 +838,7 @@ static int str_verify_pattern_cb(void *data, const char *input)
 {
 	struct thread_data *td = data;
 	long off;
-	int i = 0, j = 0, len, k, base = 10;
+	int i = 0, j = 0, len, k, base = 10, pattern_length;
 	char *loc1, *loc2;
 
 	loc1 = strstr(input, "0x");
@@ -844,10 +877,23 @@ static int str_verify_pattern_cb(void *data, const char *input)
 	 * Fill the pattern all the way to the end. This greatly reduces
 	 * the number of memcpy's we have to do when verifying the IO.
 	 */
+	pattern_length = i;
 	while (i > 1 && i * 2 <= MAX_PATTERN_SIZE) {
 		memcpy(&td->o.verify_pattern[i], &td->o.verify_pattern[0], i);
 		i *= 2;
 	}
+
+	/*
+	 * Fill remainder, if the pattern multiple ends up not being
+	 * MAX_PATTERN_SIZE.
+	 */
+	while (i > 1 && i < MAX_PATTERN_SIZE) {
+		unsigned int b = min(pattern_length, MAX_PATTERN_SIZE - i);
+
+		memcpy(&td->o.verify_pattern[i], &td->o.verify_pattern[0], b);
+		i += b;
+	}
+
 	if (i == 1) {
 		/*
 		 * The code in verify_io_u_pattern assumes a single byte pattern
@@ -1272,6 +1318,11 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 			  { .ival = "vsync",
 			    .help = "Use readv/writev",
 			  },
+#ifdef CONFIG_PWRITEV
+			  { .ival = "pvsync",
+			    .help = "Use preadv/pwritev",
+			  },
+#endif
 #ifdef CONFIG_LIBAIO
 			  { .ival = "libaio",
 			    .help = "Linux native asynchronous IO",
@@ -1463,6 +1514,16 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.category = FIO_OPT_C_IO,
 		.group	= FIO_OPT_G_INVALID,
 	},
+	{
+		.name	= "number_ios",
+		.lname	= "Number of IOs to perform",
+		.type	= FIO_OPT_STR_VAL,
+		.off1	= td_var_offset(number_ios),
+		.help	= "Force job completion of this number of IOs",
+		.def	= "0",
+		.category = FIO_OPT_C_IO,
+		.group	= FIO_OPT_G_INVALID,
+	},
 	{
 		.name	= "bs",
 		.lname	= "Block size",
@@ -1538,6 +1599,17 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.category = FIO_OPT_C_IO,
 		.group	= FIO_OPT_G_INVALID,
 	},
+	{
+		.name	= "bs_is_seq_rand",
+		.lname	= "Block size division is seq/random (not read/write)",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(bs_is_seq_rand),
+		.help	= "Consider any blocksize setting to be sequential,ramdom",
+		.def	= "0",
+		.parent = "blocksize",
+		.category = FIO_OPT_C_IO,
+		.group	= FIO_OPT_G_INVALID,
+	},
 	{
 		.name	= "randrepeat",
 		.lname	= "Random repeatable",
@@ -1629,6 +1701,28 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.category = FIO_OPT_C_IO,
 		.group	= FIO_OPT_G_RANDOM,
 	},
+	{
+		.name	= "percentage_random",
+		.lname	= "Percentage Random",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(perc_rand[DDIR_READ]),
+		.off2	= td_var_offset(perc_rand[DDIR_WRITE]),
+		.off3	= td_var_offset(perc_rand[DDIR_TRIM]),
+		.maxval	= 100,
+		.help	= "Percentage of seq/random mix that should be random",
+		.def	= "100,100,100",
+		.interval = 5,
+		.inverse = "percentage_sequential",
+		.category = FIO_OPT_C_IO,
+		.group	= FIO_OPT_G_RANDOM,
+	},
+	{
+		.name	= "percentage_sequential",
+		.lname	= "Percentage Sequential",
+		.type	= FIO_OPT_DEPRECATED,
+		.category = FIO_OPT_C_IO,
+		.group	= FIO_OPT_G_RANDOM,
+	},
 	{
 		.name	= "nrfiles",
 		.lname	= "Number of files",
@@ -2717,7 +2811,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 	{
 		.name	= "write_iops_log",
 		.lname	= "Write IOPS log",
-		.type	= FIO_OPT_STR,
+		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(iops_log_file),
 		.help	= "Write log of IOPS during run",
 		.category = FIO_OPT_C_LOG,
@@ -2763,7 +2857,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 	{
 		.name	= "group_reporting",
 		.lname	= "Group reporting",
-		.type	= FIO_OPT_BOOL,
+		.type	= FIO_OPT_STR_SET,
 		.off1	= td_var_offset(group_reporting),
 		.help	= "Do reporting on a per-group basis",
 		.category = FIO_OPT_C_STAT,