X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=55ac82659cc81670640ab04941849fb7d52772f2;hp=8f10bfdc0ce3552d1a1f7ccd6f1cdc613bf4ad73;hb=009bd847b5aeaca78e76de3a7066fe7d507a735f;hpb=4ba66134744885e676167dede2f5900512834a31

diff --git a/io_u.c b/io_u.c
index 8f10bfdc..55ac8265 100644
--- a/io_u.c
+++ b/io_u.c
@@ -24,11 +24,12 @@ struct io_completion_data {
  * The ->file_map[] contains a map of blocks we have or have not done io
  * to yet. Used to make sure we cover the entire range in a fair fashion.
  */
-static int random_map_free(struct thread_data *td, struct fio_file *f,
-			   unsigned long long block)
+static int random_map_free(struct fio_file *f, const unsigned long long block)
 {
-	unsigned int idx = RAND_MAP_IDX(td, f, block);
-	unsigned int bit = RAND_MAP_BIT(td, f, block);
+	unsigned int idx = RAND_MAP_IDX(f, block);
+	unsigned int bit = RAND_MAP_BIT(f, block);
+
+	dprint(FD_RANDOM, "free: b=%llu, idx=%u, bit=%u\n", block, idx, bit);
 
 	return (f->file_map[idx] & (1UL << bit)) == 0;
 }
@@ -44,7 +45,7 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 	unsigned int blocks;
 	unsigned int nr_blocks;
 
-	block = io_u->offset / (unsigned long long) min_bs;
+	block = (io_u->offset - f->file_offset) / (unsigned long long) min_bs;
 	blocks = 0;
 	nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
 
@@ -55,11 +56,11 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 		 * If we have a mixed random workload, we may
 		 * encounter blocks we already did IO to.
 		 */
-		if (!td->o.ddir_nr == 1 && !random_map_free(td, f, block))
+		if ((td->o.ddir_nr == 1) && !random_map_free(f, block))
 			break;
 
-		idx = RAND_MAP_IDX(td, f, block);
-		bit = RAND_MAP_BIT(td, f, block);
+		idx = RAND_MAP_IDX(f, block);
+		bit = RAND_MAP_BIT(f, block);
 
 		fio_assert(td, idx < f->num_maps);
 
@@ -78,11 +79,11 @@ static inline unsigned long long last_block(struct thread_data *td,
 {
 	unsigned long long max_blocks;
 
-	max_blocks = f->io_size / td->o.min_bs[ddir];
+	max_blocks = f->io_size / (unsigned long long) td->o.min_bs[ddir];
 	if (!max_blocks)
 		return 0;
 
-	return max_blocks - 1;
+	return max_blocks;
 }
 
 /*
@@ -91,11 +92,12 @@ static inline unsigned long long last_block(struct thread_data *td,
 static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 			       enum fio_ddir ddir, unsigned long long *b)
 {
+	unsigned long long min_bs = td->o.rw_min_bs;
 	int i;
 
 	i = f->last_free_lookup;
 	*b = (i * BLOCKS_PER_MAP);
-	while ((*b) * td->o.rw_min_bs < f->real_file_size) {
+	while ((*b) * min_bs < f->real_file_size) {
 		if (f->file_map[i] != -1UL) {
 			*b += fio_ffz(f->file_map[i]);
 			if (*b > last_block(td, f, ddir))
@@ -115,26 +117,29 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
 				enum fio_ddir ddir, unsigned long long *b)
 {
-	unsigned long long r, rb;
+	unsigned long long r;
 	int loops = 5;
 
 	do {
 		r = os_random_long(&td->random_state);
-		*b = last_block(td, f, ddir);
+		dprint(FD_RANDOM, "off rand %llu\n", r);
+		*b = (last_block(td, f, ddir) - 1)
+			* (r / ((unsigned long long) RAND_MAX + 1.0));
 
 		/*
 		 * if we are not maintaining a random map, we are done.
 		 */
-		if (td->o.norandommap)
+		if (!file_randommap(td, f))
 			return 0;
 
 		/*
-		 * calculate map offset and chec if it's free
+		 * calculate map offset and check if it's free
 		 */
-		rb = *b;
-		if (random_map_free(td, f, rb))
+		if (random_map_free(f, *b))
 			return 0;
 
+		dprint(FD_RANDOM, "get_next_rand_offset: offset %llu busy\n",
+									*b);
 	} while (--loops);
 
 	/*
@@ -183,7 +188,14 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 			b = (f->last_pos - f->file_offset) / td->o.min_bs[ddir];
 	}
 
-	io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
+	io_u->offset = b * td->o.min_bs[ddir];
+	if (io_u->offset >= f->io_size) {
+		dprint(FD_IO, "get_next_offset: offset %llu >= io_size %llu\n",
+					io_u->offset, f->io_size);
+		return 1;
+	}
+
+	io_u->offset += f->file_offset;
 	if (io_u->offset >= f->real_file_size) {
 		dprint(FD_IO, "get_next_offset: offset %llu >= size %llu\n",
 					io_u->offset, f->real_file_size);
@@ -203,9 +215,11 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 		buflen = td->o.min_bs[ddir];
 	else {
 		r = os_random_long(&td->bsrange_state);
-		if (!td->o.bssplit_nr)
-			buflen = (unsigned int) (1 + (double) (td->o.max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
-		else {
+		if (!td->o.bssplit_nr) {
+			buflen = (unsigned int)
+					(1 + (double) (td->o.max_bs[ddir] - 1)
+					* r / (RAND_MAX + 1.0));
+		} else {
 			long perc = 0;
 			unsigned int i;
 
@@ -218,8 +232,10 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 					break;
 			}
 		}
-		if (!td->o.bs_unaligned)
-			buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
+		if (!td->o.bs_unaligned) {
+			buflen = (buflen + td->o.min_bs[ddir] - 1)
+					& ~(td->o.min_bs[ddir] - 1);
+		}
 	}
 
 	if (io_u->offset + buflen > io_u->file->real_file_size) {
@@ -233,7 +249,7 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 
 static void set_rwmix_bytes(struct thread_data *td)
 {
-	unsigned long long rbytes;
+	unsigned long issues;
 	unsigned int diff;
 
 	/*
@@ -241,10 +257,11 @@ static void set_rwmix_bytes(struct thread_data *td)
 	 * buffered writes may issue a lot quicker than they complete,
 	 * whereas reads do not.
 	 */
-	rbytes = td->io_bytes[td->rwmix_ddir] - td->rwmix_bytes;
+	issues = td->io_issues[td->rwmix_ddir] - td->rwmix_issues;
 	diff = td->o.rwmix[td->rwmix_ddir ^ 1];
 
-	td->rwmix_bytes = td->io_bytes[td->rwmix_ddir] + (rbytes * ((100 - diff)) / diff);
+	td->rwmix_issues = td->io_issues[td->rwmix_ddir]
+				+ (issues * ((100 - diff)) / diff);
 }
 
 static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
@@ -268,27 +285,12 @@ static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
 static enum fio_ddir get_rw_ddir(struct thread_data *td)
 {
 	if (td_rw(td)) {
-		struct timeval now;
-		unsigned long elapsed;
-		unsigned int cycle;
-
-		fio_gettime(&now, NULL);
-	 	elapsed = mtime_since_now(&td->rwmix_switch);
-
-		/*
-		 * if this is the first cycle, make it shorter
-		 */
-		cycle = td->o.rwmixcycle;
-		if (!td->rwmix_bytes)
-			cycle /= 10;
-
 		/*
 		 * Check if it's time to seed a new data direction.
 		 */
-		if (elapsed >= cycle ||
-		    td->io_bytes[td->rwmix_ddir] >= td->rwmix_bytes) {
+		if (td->io_issues[td->rwmix_ddir] >= td->rwmix_issues) {
 			unsigned long long max_bytes;
-			enum fio_ddir ddir;			
+			enum fio_ddir ddir;
 
 			/*
 			 * Put a top limit on how many bytes we do for
@@ -297,11 +299,11 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
 			 */
 			ddir = get_rand_ddir(td);
 			max_bytes = td->this_io_bytes[ddir];
-			if (max_bytes >= (td->o.size * td->o.rwmix[ddir] / 100)) {
-				if (!td->rw_end_set[ddir]) {
+			if (max_bytes >=
+			    (td->o.size * td->o.rwmix[ddir] / 100)) {
+				if (!td->rw_end_set[ddir])
 					td->rw_end_set[ddir] = 1;
-					memcpy(&td->rw_end[ddir], &now, sizeof(now));
-				}
+
 				ddir ^= 1;
 			}
 
@@ -309,7 +311,6 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
 				set_rwmix_bytes(td);
 
 			td->rwmix_ddir = ddir;
-			memcpy(&td->rwmix_switch, &now, sizeof(now));
 		}
 		return td->rwmix_ddir;
 	} else if (td_read(td))
@@ -323,8 +324,12 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
 	assert((io_u->flags & IO_U_F_FREE) == 0);
 	io_u->flags |= IO_U_F_FREE;
 
-	if (io_u->file)
-		put_file(td, io_u->file);
+	if (io_u->file) {
+		int ret = put_file(td, io_u->file);
+
+		if (ret)
+			td_verror(td, ret, "file close");
+	}
 
 	io_u->file = NULL;
 	list_del(&io_u->list);
@@ -339,7 +344,7 @@ void requeue_io_u(struct thread_data *td, struct io_u **io_u)
 	__io_u->flags |= IO_U_F_FREE;
 	if ((__io_u->flags & IO_U_F_FLIGHT) && (__io_u->ddir != DDIR_SYNC))
 		td->io_issues[__io_u->ddir]--;
-		
+
 	__io_u->flags &= ~IO_U_F_FLIGHT;
 
 	list_del(&__io_u->list);
@@ -399,7 +404,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	/*
 	 * mark entry before potentially trimming io_u
 	 */
-	if (td_random(td) && !td->o.norandommap)
+	if (td_random(td) && file_randommap(td, io_u->file))
 		mark_random_map(td, io_u);
 
 	/*
@@ -412,13 +417,10 @@ out:
 	return 0;
 }
 
-void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
+void io_u_mark_depth(struct thread_data *td, unsigned int nr)
 {
 	int index = 0;
 
-	if (io_u->ddir == DDIR_SYNC)
-		return;
-
 	switch (td->cur_depth) {
 	default:
 		index = 6;
@@ -441,8 +443,7 @@ void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
 		break;
 	}
 
-	td->ts.io_u_map[index]++;
-	td->ts.total_io_u[io_u->ddir]++;
+	td->ts.io_u_map[index] += nr;
 }
 
 static void io_u_mark_lat_usec(struct thread_data *td, unsigned long usec)
@@ -551,8 +552,9 @@ static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
 	do {
 		long r = os_random_long(&td->next_file_state);
 
-		fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
-		f = &td->files[fno];
+		fno = (unsigned int) ((double) td->o.nr_files
+			* (r / (RAND_MAX + 1.0)));
+		f = td->files[fno];
 		if (f->flags & FIO_FILE_DONE)
 			continue;
 
@@ -573,7 +575,7 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
 	struct fio_file *f;
 
 	do {
-		f = &td->files[td->next_file];
+		f = td->files[td->next_file];
 
 		td->next_file++;
 		if (td->next_file >= td->o.nr_files)
@@ -601,7 +603,10 @@ static struct fio_file *get_next_file(struct thread_data *td)
 	assert(td->o.nr_files <= td->files_index);
 
 	if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files) {
-		dprint(FD_FILE, "get_next_file: nr_open=%d, nr_done=%d, nr_files=%d\n", td->nr_open_files, td->nr_done_files, td->o.nr_files);
+		dprint(FD_FILE, "get_next_file: nr_open=%d, nr_done=%d,"
+				" nr_files=%d\n", td->nr_open_files,
+						  td->nr_done_files,
+						  td->o.nr_files);
 		return NULL;
 	}
 
@@ -652,6 +657,16 @@ set_file:
 		if (!fill_io_u(td, io_u))
 			break;
 
+		/*
+		 * optimization to prevent close/open of the same file. This
+		 * way we preserve queueing etc.
+		 */
+		if (td->o.nr_files == 1 && td->o.time_based) {
+			put_file(td, f);
+			fio_file_reset(f);
+			goto set_file;
+		}
+
 		/*
 		 * td_io_close() does a put_file() as well, so no need to
 		 * do that here.
@@ -739,7 +754,7 @@ struct io_u *get_io_u(struct thread_data *td)
 		dprint(FD_IO, "io_u %p, setting file failed\n", io_u);
 		goto err_put;
 	}
-	
+
 	f = io_u->file;
 	assert(f->flags & FIO_FILE_OPEN);
 
@@ -759,10 +774,9 @@ struct io_u *get_io_u(struct thread_data *td)
 	 * Set io data pointers.
 	 */
 	io_u->endpos = io_u->offset + io_u->buflen;
-out:
 	io_u->xfer_buf = io_u->buf;
 	io_u->xfer_buflen = io_u->buflen;
-
+out:
 	if (!td_io_prep(td, io_u)) {
 		fio_gettime(&io_u->start_time, NULL);
 		return io_u;
@@ -784,7 +798,8 @@ void io_u_log_error(struct thread_data *td, struct io_u *io_u)
 
 	log_err(": %s\n", strerror(io_u->error));
 
-	log_err("     %s offset=%llu, buflen=%lu\n", msg[io_u->ddir], io_u->offset, io_u->xfer_buflen);
+	log_err("     %s offset=%llu, buflen=%lu\n", msg[io_u->ddir],
+					io_u->offset, io_u->xfer_buflen);
 
 	if (!td->error)
 		td_verror(td, io_u->error, "io_u error");
@@ -816,8 +831,6 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 		td->io_bytes[idx] += bytes;
 		td->this_io_bytes[idx] += bytes;
 
-		io_u->file->last_completed_pos = io_u->endpos;
-
 		usec = utime_since(&io_u->issue_time, &icd->time);
 
 		add_clat_sample(td, idx, usec);
@@ -945,7 +958,10 @@ static void io_u_dump(struct io_u *io_u)
 	unsigned long t_issue = mtime_since_now(&io_u->issue_time);
 
 	log_err("io_u=%p, t_start=%lu, t_issue=%lu\n", io_u, t_start, t_issue);
-	log_err("  buf=%p/%p, len=%lu/%lu, offset=%llu\n", io_u->buf, io_u->xfer_buf, io_u->buflen, io_u->xfer_buflen, io_u->offset);
+	log_err("  buf=%p/%p, len=%lu/%lu, offset=%llu\n", io_u->buf,
+						io_u->xfer_buf, io_u->buflen,
+						io_u->xfer_buflen,
+						io_u->offset);
 	log_err("  ddir=%d, fname=%s\n", io_u->ddir, io_u->file->file_name);
 }
 #else