X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=01e615f92e90e1f37864e591279f037c8ddba55c;hp=4fe1dce8b9b8a306ff30e8afcdf9f88a6ec06474;hb=0aabe160c38efc3c42157fac2a9af08e070341c6;hpb=16edf25dba269ee9e8239130e75b690440b1e120

diff --git a/init.c b/init.c
index 4fe1dce8..01e615f9 100644
--- a/init.c
+++ b/init.c
@@ -33,6 +33,7 @@ static int str_prioclass_cb(void *, unsigned int *);
 #endif
 static int str_exitall_cb(void);
 static int str_cpumask_cb(void *, unsigned int *);
+static int str_file_service_cb(void *, const char *);
 
 #define __stringify_1(x)	#x
 #define __stringify(x)		__stringify_1(x)
@@ -81,7 +82,7 @@ static struct fio_option options[] = {
 		.help	= "IO engine to use",
 		.def	= "sync",
 		.posval	= { "sync", "libaio", "posixaio", "mmap", "splice",
-				"sg", "null", "net", },
+				"sg", "null", "net", "syslet-rw" },
 	},
 	{
 		.name	= "iodepth",
@@ -90,6 +91,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,
@@ -146,6 +153,14 @@ static struct fio_option options[] = {
 		.help	= "Split job workload between this number of files",
 		.def	= "1",
 	},
+	{
+		.name	= "file_service_type",
+		.type	= FIO_OPT_STR,
+		.cb	= str_file_service_cb,
+		.help	= "How to select which file to service next",
+		.def	= "roundrobin",
+		.posval	= { "random", "roundrobin" },
+	},
 	{
 		.name	= "fsync",
 		.type	= FIO_OPT_INT,
@@ -330,6 +345,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 +653,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;
 }
 
 /*
@@ -639,7 +673,7 @@ static void fixup_options(struct thread_data *td)
 static char *to_kmg(unsigned int val)
 {
 	char *buf = malloc(32);
-	char post[] = { 0, 'K', 'M', 'G', 'P', 0 };
+	char post[] = { 0, 'K', 'M', 'G', 'P', 'E', 0 };
 	char *p = post;
 
 	do {
@@ -679,7 +713,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))
@@ -700,7 +734,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 		if (td->directory && td->directory[0] != '\0') {
 			if (lstat(td->directory, &sb) < 0) {
 				log_err("fio: %s is not a directory\n", td->directory);
-				td_verror(td, errno);
+				td_verror(td, errno, "lstat");
 				return 1;
 			}
 			if (!S_ISDIR(sb.st_mode)) {
@@ -739,9 +773,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 +786,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);
@@ -816,7 +850,7 @@ err:
  */
 int init_random_state(struct thread_data *td)
 {
-	unsigned long seeds[4];
+	unsigned long seeds[5];
 	int fd, num_maps, blocks, i;
 	struct fio_file *f;
 
@@ -825,12 +859,12 @@ int init_random_state(struct thread_data *td)
 
 	fd = open("/dev/urandom", O_RDONLY);
 	if (fd == -1) {
-		td_verror(td, errno);
+		td_verror(td, errno, "open");
 		return 1;
 	}
 
 	if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
-		td_verror(td, EIO);
+		td_verror(td, EIO, "read");
 		close(fd);
 		return 1;
 	}
@@ -840,16 +874,17 @@ int init_random_state(struct thread_data *td)
 	os_random_seed(seeds[0], &td->bsrange_state);
 	os_random_seed(seeds[1], &td->verify_state);
 	os_random_seed(seeds[2], &td->rwmix_state);
+	os_random_seed(seeds[3], &td->next_file_state);
 
 	if (td->sequential)
 		return 0;
 
 	if (td->rand_repeatable)
-		seeds[3] = FIO_RANDSEED;
+		seeds[4] = FIO_RANDSEED * td->thread_number;
 
 	if (!td->norandommap) {
 		for_each_file(td, f, i) {
-			blocks = (f->file_size + td->rw_min_bs - 1) / td->rw_min_bs;
+			blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
 			num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
 			f->file_map = malloc(num_maps * sizeof(long));
 			f->num_maps = num_maps;
@@ -857,7 +892,7 @@ int init_random_state(struct thread_data *td)
 		}
 	}
 
-	os_random_seed(seeds[3], &td->random_state);
+	os_random_seed(seeds[4], &td->random_state);
 	return 0;
 }
 
@@ -882,6 +917,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 +1054,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;
 }
@@ -1060,6 +1097,22 @@ static int str_cpumask_cb(void *data, unsigned int *val)
 	return 0;
 }
 
+static int str_file_service_cb(void *data, const char *str)
+{
+	struct thread_data *td = data;
+
+	if (!strncmp(str, "random", 6)) {
+		td->file_service_type = FIO_FSERVICE_RANDOM;
+		return 0;
+	} else if (!strncmp(str, "roundrobin", 10)) {
+		td->file_service_type = FIO_FSERVICE_RR;
+		return 0;
+	}
+
+	log_err("fio: file_service= random, roundrobin\n");
+	return 1;
+}
+
 /*
  * This is our [ini] type file parser.
  */