X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=options.c;h=04ed548d97b5a992cf6e50e220f64c9d5b43075c;hb=20e354ef1243541ea196619772b83a962d7cb4df;hp=54ceaeed706cbaa110eff416375cbe5f5beb7393;hpb=0a839f308177e95c4c45c41ee1d4fa2b8f231f24;p=fio.git

diff --git a/options.c b/options.c
index 54ceaeed..04ed548d 100644
--- a/options.c
+++ b/options.c
@@ -98,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)
 {
@@ -294,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",
@@ -347,6 +369,7 @@ static struct fio_option options[] = {
 		.name	= "size",
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(size),
+		.minval = 1,
 		.help	= "Total size of device or files",
 	},
 	{
@@ -354,6 +377,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_VAL,
 		.off1	= td_var_offset(file_size_low),
 		.off2	= td_var_offset(file_size_high),
+		.minval = 1,
 		.help	= "Size of individual files",
 	},
 	{
@@ -362,6 +386,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_VAL_INT,
 		.off1	= td_var_offset(bs[DDIR_READ]),
 		.off2	= td_var_offset(bs[DDIR_WRITE]),
+		.minval = 1,
 		.help	= "Block size unit",
 		.def	= "4k",
 	},
@@ -373,6 +398,7 @@ static struct fio_option options[] = {
 		.off2	= td_var_offset(max_bs[DDIR_READ]),
 		.off3	= td_var_offset(min_bs[DDIR_WRITE]),
 		.off4	= td_var_offset(max_bs[DDIR_WRITE]),
+		.minval = 1,
 		.help	= "Set block size range (in more detail than bs)",
 	},
 	{
@@ -775,6 +801,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",