X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=94eacbaaebbb6e7ca448bfefe17b735db7c659cd;hp=7d4396e81d1aa637748bd135c52e520c09beb7ca;hb=d8602dd08170e11fb91dccde945bc527dbba57aa;hpb=171e38ab2b03683a9d559ee9fffcbe052484baba;ds=sidebyside

diff --git a/options.c b/options.c
index 7d4396e8..94eacbaa 100644
--- a/options.c
+++ b/options.c
@@ -32,7 +32,7 @@ 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);
 
@@ -64,6 +64,13 @@ static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
 static int str_prioclass_cb(void *data, unsigned int *val)
 {
 	struct thread_data *td = data;
+	unsigned short mask;
+
+	/*
+	 * mask off old class bits, str_prio_cb() may have set a default class
+	 */
+	mask = (1 << IOPRIO_CLASS_SHIFT) - 1;
+	td->ioprio &= mask;
 
 	td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
 	return 0;
@@ -74,6 +81,13 @@ static int str_prio_cb(void *data, unsigned int *val)
 	struct thread_data *td = data;
 
 	td->ioprio |= *val;
+
+	/*
+	 * If no class is set, assume BE
+	 */
+	if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
+		td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
+
 	return 0;
 }
 #endif
@@ -84,27 +98,46 @@ static int str_exitall_cb(void)
 	return 0;
 }
 
-static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
-{
 #ifdef FIO_HAVE_CPU_AFFINITY
+static int str_cpumask_cb(void *data, unsigned int *val)
+{
+	struct thread_data *td = data;
 	unsigned int i;
 
-	CPU_ZERO(&cpumask);
+	CPU_ZERO(&td->o.cpumask);
 
-	for (i = 0; i < sizeof(int) * 8; i++) {
-		if ((1 << i) & cpu)
-			CPU_SET(i, &cpumask);
-	}
-#endif
+	for (i = 0; i < sizeof(int) * 8; i++)
+		if ((1 << i) & *val)
+			CPU_SET(*val, &td->o.cpumask);
+
+	td->o.cpumask_set = 1;
+	return 0;
 }
 
-static int str_cpumask_cb(void *data, unsigned int *val)
+static int str_cpus_allowed_cb(void *data, const char *input)
 {
 	struct thread_data *td = data;
+	char *cpu, *str, *p;
+
+	CPU_ZERO(&td->o.cpumask);
+
+	p = str = strdup(input);
 
-	fill_cpu_mask(td->o.cpumask, *val);
+	strip_blank_front(&str);
+	strip_blank_end(str);
+
+	while ((cpu = strsep(&str, ",")) != NULL) {
+		if (!strlen(cpu))
+			break;
+		CPU_SET(atoi(cpu), &td->o.cpumask);
+	}
+
+	free(p);
+	td->o.cpumask_set = 1;
+	exit(0);
 	return 0;
 }
+#endif
 
 static int str_fst_cb(void *data, const char *str)
 {
@@ -280,6 +313,9 @@ static struct fio_option options[] = {
 			  { .ival = "splice",
 			    .help = "splice/vmsplice based IO",
 			  },
+			  { .ival = "netsplice",
+			    .help = "splice/vmsplice to/from the network",
+			  },
 #endif
 #ifdef FIO_HAVE_SGIO
 			  { .ival = "sg",
@@ -477,6 +513,12 @@ static struct fio_option options[] = {
 		.help	= "Stop workload when this amount of time has passed",
 		.def	= "0",
 	},
+	{
+		.name	= "time_based",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= td_var_offset(time_based),
+		.help	= "Keep running until runtime/timeout is met",
+	},
 	{
 		.name	= "mem",
 		.alias	= "iomem",
@@ -531,8 +573,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,
@@ -743,6 +797,12 @@ static struct fio_option options[] = {
 		.cb	= str_cpumask_cb,
 		.help	= "CPU affinity mask",
 	},
+	{
+		.name	= "cpus_allowed",
+		.type	= FIO_OPT_STR,
+		.cb	= str_cpus_allowed_cb,
+		.help	= "Set CPUs allowed",
+	},
 #endif
 	{
 		.name	= "end_fsync",
@@ -814,6 +874,21 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(group_reporting),
 		.help	= "Do reporting on a per-group basis",
 	},
+	{
+		.name	= "zero_buffers",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= td_var_offset(zero_buffers),
+		.help	= "Init IO buffers to all zeroes",
+	},
+#ifdef FIO_HAVE_DISK_UTIL
+	{
+		.name	= "disk_util",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(do_disk_util),
+		.help	= "Log disk utilization stats",
+		.def	= "1",
+	},
+#endif
 	{
 		.name = NULL,
 	},
@@ -896,7 +971,9 @@ void options_mem_dupe(struct thread_data *td)
 	__options_mem(td, 1);
 }
 
-void options_mem_free(struct thread_data *td)
+void options_mem_free(struct thread_data fio_unused *td)
 {
+#if 0
 	__options_mem(td, 0);
+#endif
 }