X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=f5bc9c073c6f9f1e62a5674fbecd82b62aabe681;hp=cc131a288c1b2f5244bc279dfdffa6031017e39d;hb=690dec6e4ec7297a477b809fa24ee23dc02348c9;hpb=417f006858ec66f0b410c83c2e13da54662048e0

diff --git a/options.c b/options.c
index cc131a28..f5bc9c07 100644
--- a/options.c
+++ b/options.c
@@ -12,7 +12,7 @@
 
 #include "fio.h"
 #include "parse.h"
-#include "fls.h"
+#include "lib/fls.h"
 
 #define td_var_offset(var)	((size_t) &((struct thread_options *)0)->var)
 
@@ -154,8 +154,10 @@ static int str_rw_cb(void *data, const char *str)
 	char *nr = get_opt_postfix(str);
 
 	td->o.ddir_nr = 1;
-	if (nr)
+	if (nr) {
 		td->o.ddir_nr = atoi(nr);
+		free(nr);
+	}
 
 	return 0;
 }
@@ -244,12 +246,29 @@ static int str_cpumask_cb(void *data, unsigned int *val)
 {
 	struct thread_data *td = data;
 	unsigned int i;
+	long max_cpu;
+	int ret;
 
-	CPU_ZERO(&td->o.cpumask);
+	ret = fio_cpuset_init(&td->o.cpumask);
+	if (ret < 0) {
+		log_err("fio: cpuset_init failed\n");
+		td_verror(td, ret, "fio_cpuset_init");
+		return 1;
+	}
 
-	for (i = 0; i < sizeof(int) * 8; i++)
-		if ((1 << i) & *val)
-			CPU_SET(*val, &td->o.cpumask);
+	max_cpu = sysconf(_SC_NPROCESSORS_ONLN);
+
+	for (i = 0; i < sizeof(int) * 8; i++) {
+		if ((1 << i) & *val) {
+			if (i > max_cpu) {
+				log_err("fio: CPU %d too large (max=%ld)\n", i,
+								max_cpu);
+				return 1;
+			}
+			dprint(FD_PARSE, "set cpu allowed %d\n", i);
+			fio_cpu_set(&td->o.cpumask, i);
+		}
+	}
 
 	td->o.cpumask_set = 1;
 	return 0;
@@ -259,23 +278,68 @@ static int str_cpus_allowed_cb(void *data, const char *input)
 {
 	struct thread_data *td = data;
 	char *cpu, *str, *p;
+	long max_cpu;
+	int ret = 0;
 
-	CPU_ZERO(&td->o.cpumask);
+	ret = fio_cpuset_init(&td->o.cpumask);
+	if (ret < 0) {
+		log_err("fio: cpuset_init failed\n");
+		td_verror(td, ret, "fio_cpuset_init");
+		return 1;
+	}
 
 	p = str = strdup(input);
 
 	strip_blank_front(&str);
 	strip_blank_end(str);
 
+	max_cpu = sysconf(_SC_NPROCESSORS_ONLN);
+
 	while ((cpu = strsep(&str, ",")) != NULL) {
+		char *str2, *cpu2;
+		int icpu, icpu2;
+
 		if (!strlen(cpu))
 			break;
-		CPU_SET(atoi(cpu), &td->o.cpumask);
+
+		str2 = cpu;
+		icpu2 = -1;
+		while ((cpu2 = strsep(&str2, "-")) != NULL) {
+			if (!strlen(cpu2))
+				break;
+
+			icpu2 = atoi(cpu2);
+		}
+
+		icpu = atoi(cpu);
+		if (icpu2 == -1)
+			icpu2 = icpu;
+		while (icpu <= icpu2) {
+			if (icpu >= FIO_MAX_CPUS) {
+				log_err("fio: your OS only supports up to"
+					" %d CPUs\n", (int) FIO_MAX_CPUS);
+				ret = 1;
+				break;
+			}
+			if (icpu > max_cpu) {
+				log_err("fio: CPU %d too large (max=%ld)\n",
+							icpu, max_cpu);
+				ret = 1;
+				break;
+			}
+	
+			dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
+			fio_cpu_set(&td->o.cpumask, icpu);
+			icpu++;
+		}
+		if (ret)
+			break;
 	}
 
 	free(p);
-	td->o.cpumask_set = 1;
-	return 0;
+	if (!ret)
+		td->o.cpumask_set = 1;
+	return ret;
 }
 #endif
 
@@ -285,8 +349,10 @@ static int str_fst_cb(void *data, const char *str)
 	char *nr = get_opt_postfix(str);
 
 	td->file_service_nr = 1;
-	if (nr)
+	if (nr) {
 		td->file_service_nr = atoi(nr);
+		free(nr);
+	}
 
 	return 0;
 }
@@ -406,7 +472,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
 	struct thread_data *td = data;
 	unsigned int msb;
 
-	msb = fls(*off);
+	msb = __fls(*off);
 	if (msb <= 8)
 		td->o.verify_pattern_bytes = 1;
 	else if (msb <= 16)
@@ -426,12 +492,60 @@ static int str_lockfile_cb(void *data, const char *str)
 	char *nr = get_opt_postfix(str);
 
 	td->o.lockfile_batch = 1;
-	if (nr)
+	if (nr) {
 		td->o.lockfile_batch = atoi(nr);
+		free(nr);
+	}
+
+	return 0;
+}
+
+static int str_write_bw_log_cb(void *data, const char *str)
+{
+	struct thread_data *td = data;
+
+	if (str)
+		td->o.bw_log_file = strdup(str);
+
+	td->o.write_bw_log = 1;
+	return 0;
+}
+
+static int str_write_lat_log_cb(void *data, const char *str)
+{
+	struct thread_data *td = data;
+
+	if (str)
+		td->o.lat_log_file = strdup(str);
+
+	td->o.write_lat_log = 1;
+	return 0;
+}
+
+static int str_gtod_reduce_cb(void *data, int *il)
+{
+	struct thread_data *td = data;
+	int val = *il;
+
+	td->o.disable_clat = !!val;
+	td->o.disable_slat = !!val;
+	td->o.disable_bw = !!val;
+	if (val)
+		td->tv_cache_mask = 63;
 
 	return 0;
 }
 
+static int str_gtod_cpu_cb(void *data, int *il)
+{
+	struct thread_data *td = data;
+	int val = *il;
+
+	td->o.gtod_cpu = val;
+	td->o.gtod_offload = 1;
+	return 0;
+}
+
 #define __stringify_1(x)	#x
 #define __stringify(x)		__stringify_1(x)
 
@@ -463,6 +577,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_STORE,
 		.off1	= td_var_offset(filename),
 		.cb	= str_filename_cb,
+		.prio	= 1, /* must come before "directory" */
 		.help	= "File(s) to use for the workload",
 	},
 	{
@@ -612,6 +727,7 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "iodepth_batch",
+		.alias	= "iodepth_batch_submit",
 		.type	= FIO_OPT_INT,
 		.off1	= td_var_offset(iodepth_batch),
 		.help	= "Number of IO to submit in one go",
@@ -619,6 +735,15 @@ static struct fio_option options[] = {
 		.minval	= 1,
 		.def	= "1",
 	},
+	{
+		.name	= "iodepth_batch_complete",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(iodepth_batch_complete),
+		.help	= "Number of IO to retrieve in one go",
+		.parent	= "iodepth",
+		.minval	= 0,
+		.def	= "1",
+	},
 	{
 		.name	= "iodepth_low",
 		.type	= FIO_OPT_INT,
@@ -713,7 +838,7 @@ static struct fio_option options[] = {
 		.name	= "softrandommap",
 		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(softrandommap),
-		.help	= "Allow randommap to fail and continue witout",
+		.help	= "Set norandommap if randommap allocation fails",
 		.parent	= "norandommap",
 		.def	= "0",
 	},
@@ -820,6 +945,12 @@ static struct fio_option options[] = {
 		.off1	= td_var_offset(time_based),
 		.help	= "Keep running until runtime/timeout is met",
 	},
+	{
+		.name	= "ramp_time",
+		.type	= FIO_OPT_STR_VAL_TIME,
+		.off1	= td_var_offset(ramp_time),
+		.help	= "Ramp up time before measuring performance",
+	},
 	{
 		.name	= "mem",
 		.alias	= "iomem",
@@ -878,6 +1009,14 @@ static struct fio_option options[] = {
 			    .oval = VERIFY_CRC32,
 			    .help = "Use crc32 checksums for verification",
 			  },
+			  { .ival = "crc32c-intel",
+			    .oval = VERIFY_CRC32C_INTEL,
+			    .help = "Use hw crc32c checksums for verification",
+			  },
+			  { .ival = "crc32c",
+			    .oval = VERIFY_CRC32C,
+			    .help = "Use crc32c checksums for verification",
+			  },
 			  { .ival = "crc16",
 			    .oval = VERIFY_CRC16,
 			    .help = "Use crc16 checksums for verification",
@@ -1221,14 +1360,16 @@ static struct fio_option options[] = {
 	},
 	{
 		.name	= "write_bw_log",
-		.type	= FIO_OPT_STR_SET,
+		.type	= FIO_OPT_STR,
 		.off1	= td_var_offset(write_bw_log),
+		.cb	= str_write_bw_log_cb,
 		.help	= "Write log of bandwidth during run",
 	},
 	{
 		.name	= "write_lat_log",
-		.type	= FIO_OPT_STR_SET,
+		.type	= FIO_OPT_STR,
 		.off1	= td_var_offset(write_lat_log),
+		.cb	= str_write_lat_log_cb,
 		.help	= "Write log of latency during run",
 	},
 	{
@@ -1261,10 +1402,47 @@ static struct fio_option options[] = {
 		.name	= "disk_util",
 		.type	= FIO_OPT_BOOL,
 		.off1	= td_var_offset(do_disk_util),
-		.help	= "Log disk utilization stats",
+		.help	= "Log disk utilization statistics",
 		.def	= "1",
 	},
 #endif
+	{
+		.name	= "gtod_reduce",
+		.type	= FIO_OPT_BOOL,
+		.help	= "Greatly reduce number of gettimeofday() calls",
+		.cb	= str_gtod_reduce_cb,
+		.def	= "0",
+	},
+	{
+		.name	= "disable_clat",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(disable_clat),
+		.help	= "Disable completion latency numbers",
+		.parent	= "gtod_reduce",
+		.def	= "0",
+	},
+	{
+		.name	= "disable_slat",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(disable_slat),
+		.help	= "Disable submissionn latency numbers",
+		.parent	= "gtod_reduce",
+		.def	= "0",
+	},
+	{
+		.name	= "disable_bw_measurement",
+		.type	= FIO_OPT_BOOL,
+		.off1	= td_var_offset(disable_bw),
+		.help	= "Disable bandwidth logging",
+		.parent	= "gtod_reduce",
+		.def	= "0",
+	},
+	{
+		.name	= "gtod_cpu",
+		.type	= FIO_OPT_INT,
+		.cb	= str_gtod_cpu_cb,
+		.help	= "Setup dedicated gettimeofday() thread on this CPU",
+	},
 	{
 		.name = NULL,
 	},
@@ -1296,9 +1474,16 @@ void fio_options_dup_and_init(struct option *long_options)
 	}
 }
 
-int fio_option_parse(struct thread_data *td, const char *opt)
+int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
 {
-	return parse_option(opt, options, td);
+	int i, ret;
+
+	sort_options(opts, options, num_opts);
+
+	for (ret = 0, i = 0; i < num_opts; i++)
+		ret |= parse_option(opts[i], options, td);
+
+	return ret;
 }
 
 int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val)