X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=a235e2f155909638cd07e517d8d6bb27047d247a;hp=f4a37401ec0b507eef3cc04252db1669be66457d;hb=94cd00dd6cf1cec4c593a74aabfbb79f4d80afb6;hpb=f3502ba2dd72d846a388c774a01c6bb833871248

diff --git a/init.c b/init.c
index f4a37401..a235e2f1 100644
--- a/init.c
+++ b/init.c
@@ -90,6 +90,12 @@ static struct fio_option options[] = {
 		.help	= "Amount of IO buffers to keep in flight",
 		.def	= "1",
 	},
+	{
+		.name	= "iodepth_low",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(iodepth_low),
+		.help	= "Low water mark for queuing depth",
+	},
 	{
 		.name	= "size",
 		.type	= FIO_OPT_STR_VAL,
@@ -330,6 +336,13 @@ static struct fio_option options[] = {
 		.help	= "Idle time between IO buffers (usec)",
 		.def	= "0",
 	},
+	{
+		.name	= "thinktime_spin",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(thinktime_spin),
+		.help	= "Start thinktime by spinning this amount (usec)",
+		.def	= "0",
+	},
 	{
 		.name	= "thinktime_blocks",
 		.type	= FIO_OPT_INT,
@@ -631,6 +644,18 @@ static void fixup_options(struct thread_data *td)
 	 */
 	if (td->filetype == FIO_TYPE_CHAR && td->odirect)
 		td->odirect = 0;
+
+	/*
+	 * thinktime_spin must be less than thinktime
+	 */
+	if (td->thinktime_spin > td->thinktime)
+		td->thinktime_spin = td->thinktime;
+
+	/*
+	 * The low water mark cannot be bigger than the iodepth
+	 */
+	if (td->iodepth_low > td->iodepth || !td->iodepth_low)
+		td->iodepth_low = td->iodepth;
 }
 
 /*
@@ -679,7 +704,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		td->io_ops->flags |= FIO_RAWIO;
 
 	td->filetype = FIO_TYPE_FILE;
-	if (!stat(jobname, &sb)) {
+	if (td->filename && !lstat(td->filename, &sb)) {
 		if (S_ISBLK(sb.st_mode))
 			td->filetype = FIO_TYPE_BD;
 		else if (S_ISCHR(sb.st_mode))
@@ -739,9 +764,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		
 	fio_sem_init(&td->mutex, 0);
 
-	td->clat_stat[0].min_val = td->clat_stat[1].min_val = ULONG_MAX;
-	td->slat_stat[0].min_val = td->slat_stat[1].min_val = ULONG_MAX;
-	td->bw_stat[0].min_val = td->bw_stat[1].min_val = ULONG_MAX;
+	td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
+	td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
+	td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
 
 	if (td->stonewall && td->thread_number > 1)
 		groupid++;
@@ -752,11 +777,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		goto err;
 
 	if (td->write_lat_log) {
-		setup_log(&td->slat_log);
-		setup_log(&td->clat_log);
+		setup_log(&td->ts.slat_log);
+		setup_log(&td->ts.clat_log);
 	}
 	if (td->write_bw_log)
-		setup_log(&td->bw_log);
+		setup_log(&td->ts.bw_log);
 
 	if (!td->name)
 		td->name = strdup(jobname);
@@ -845,7 +870,7 @@ int init_random_state(struct thread_data *td)
 		return 0;
 
 	if (td->rand_repeatable)
-		seeds[3] = FIO_RANDSEED;
+		seeds[3] = FIO_RANDSEED * td->thread_number;
 
 	if (!td->norandommap) {
 		for_each_file(td, f, i) {
@@ -882,6 +907,8 @@ static int is_empty_or_comment(char *line)
 	for (i = 0; i < strlen(line); i++) {
 		if (line[i] == ';')
 			return 1;
+		if (line[i] == '#')
+			return 1;
 		if (!isspace(line[i]) && !iscntrl(line[i]))
 			return 0;
 	}
@@ -1017,7 +1044,7 @@ static int str_ioengine_cb(void *data, const char *str)
 	if (td->io_ops)
 		return 0;
 
-	log_err("fio: ioengine= libaio, posixaio, sync, mmap, sgio, splice, cpu, null\n");
+	log_err("fio: ioengine= libaio, posixaio, sync, syslet-rw, mmap, sgio, splice, cpu, null\n");
 	log_err("fio: or specify path to dynamic ioengine module\n");
 	return 1;
 }