X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=options.c;h=5bbeb34276e622cd9f1fc2f88d14664f619b8dcf;hb=be4ecfdf6c8daa75c4df8ac875c9a87da80d81a0;hp=0608e7b2d928b5bf38385926639ffb406cd6a4d1;hpb=af497e6a1d61df088ce1a40f4fd2f38066e694b0;p=fio.git

diff --git a/options.c b/options.c
index 0608e7b2..5bbeb342 100644
--- a/options.c
+++ b/options.c
@@ -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;
 }
@@ -247,9 +249,12 @@ static int str_cpumask_cb(void *data, unsigned int *val)
 
 	CPU_ZERO(&td->o.cpumask);
 
-	for (i = 0; i < sizeof(int) * 8; i++)
-		if ((1 << i) & *val)
+	for (i = 0; i < sizeof(int) * 8; i++) {
+		if ((1 << i) & *val) {
+			dprint(FD_PARSE, "set cpu allowed %d\n", i);
 			CPU_SET(*val, &td->o.cpumask);
+		}
+	}
 
 	td->o.cpumask_set = 1;
 	return 0;
@@ -268,9 +273,29 @@ static int str_cpus_allowed_cb(void *data, const char *input)
 	strip_blank_end(str);
 
 	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) {
+			dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
+			CPU_SET(atoi(cpu), &td->o.cpumask);
+			icpu++;
+		}
 	}
 
 	free(p);
@@ -285,8 +310,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;
 }
@@ -426,12 +453,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)
 
@@ -831,6 +906,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",
@@ -1240,14 +1321,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",
 	},
 	{
@@ -1284,6 +1367,43 @@ static struct fio_option options[] = {
 		.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,
 	},