X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=2e0f8e9c601a16f8320fef4780e0bd340a9a047e;hp=fd25dfe704423dc989ef36df741efab67283d609;hb=44b5374f4d64a066643afbc91d7f3f03bb0b71f8;hpb=38d77caebcb6f9cb33f247a341c162c0185bf604

diff --git a/io_u.c b/io_u.c
index fd25dfe7..2e0f8e9c 100644
--- a/io_u.c
+++ b/io_u.c
@@ -52,7 +52,11 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 	while (blocks < nr_blocks) {
 		unsigned int idx, bit;
 
-		if (!random_map_free(td, f, block))
+		/*
+		 * If we have a mixed random workload, we may
+		 * encounter blocks we already did IO to.
+		 */
+		if (!td->o.ddir_nr && !random_map_free(td, f, block))
 			break;
 
 		idx = RAND_MAP_IDX(td, f, block);
@@ -93,6 +97,35 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 	return 1;
 }
 
+static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
+				int ddir, unsigned long long *b)
+{
+	unsigned long long max_blocks = f->file_size / td->o.min_bs[ddir];
+	unsigned long long r, rb;
+	int loops = 5;
+
+	do {
+		r = os_random_long(&td->random_state);
+		if (!max_blocks)
+			*b = 0;
+		else
+			*b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+		if (td->o.norandommap)
+			break;
+		rb = *b + (f->file_offset / td->o.min_bs[ddir]);
+		loops--;
+	} while (!random_map_free(td, f, rb) && loops);
+
+	/*
+	 * if we failed to retrieve a truly random offset within
+	 * the loops assigned, see if there are free ones left at all
+	 */
+	if (!loops && get_next_free_block(td, f, b))
+		return 1;
+
+	return 0;
+}
+
 /*
  * For random io, generate a random new block and see if it's used. Repeat
  * until we find a free one. For sequential io, just return the end of
@@ -102,30 +135,12 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 {
 	struct fio_file *f = io_u->file;
 	const int ddir = io_u->ddir;
-	unsigned long long b, rb;
-	long r;
+	unsigned long long b;
 
-	if (td_random(td)) {
-		unsigned long long max_blocks = f->file_size / td->o.min_bs[ddir];
-		int loops = 5;
-
-		do {
-			r = os_random_long(&td->random_state);
-			if (!max_blocks)
-				b = 0;
-			else
-				b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
-			if (td->o.norandommap)
-				break;
-			rb = b + (f->file_offset / td->o.min_bs[ddir]);
-			loops--;
-		} while (!random_map_free(td, f, rb) && loops);
+	if (td_random(td) && (td->o.ddir_nr && !--td->ddir_nr)) {
+		td->ddir_nr = td->o.ddir_nr;
 
-		/*
-		 * if we failed to retrieve a truly random offset within
-		 * the loops assigned, see if there are free ones left at all
-		 */
-		if (!loops && get_next_free_block(td, f, &b))
+		if (get_next_rand_offset(td, f, ddir, &b))
 			return 1;
 	} else
 		b = f->last_pos / td->o.min_bs[ddir];
@@ -295,7 +310,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	   !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
 	     td->io_issues[DDIR_WRITE] && should_fsync(td)) {
 		io_u->ddir = DDIR_SYNC;
-		return 0;
+		goto out;
 	}
 
 	io_u->ddir = get_rw_ddir(td);
@@ -314,12 +329,13 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	/*
 	 * mark entry before potentially trimming io_u
 	 */
-	if (!td->o.read_iolog && td_random(td) && !td->o.norandommap)
+	if (td_random(td) && !td->o.norandommap)
 		mark_random_map(td, io_u);
 
 	/*
 	 * If using a write iolog, store this entry.
 	 */
+out:
 	if (td->o.write_iolog_file)
 		write_iolog_put(td, io_u);
 
@@ -645,13 +661,14 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 		add_bw_sample(td, idx, &icd->time);
 		io_u_mark_latency(td, msec);
 
-		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
+		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE &&
+		    td->o.verify != VERIFY_NONE)
 			log_io_piece(td, io_u);
 
 		icd->bytes_done[idx] += bytes;
 
 		if (io_u->end_io) {
-			ret = io_u->end_io(io_u);
+			ret = io_u->end_io(td, io_u);
 			if (ret && !icd->error)
 				icd->error = ret;
 		}
@@ -711,12 +728,10 @@ long io_u_queued_complete(struct thread_data *td, int min_events)
 	struct io_completion_data icd;
 	struct timespec *tvp = NULL;
 	int ret;
+	struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
 
-	if (!min_events) {
-		struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
-
+	if (!min_events)
 		tvp = &ts;
-	}
 
 	ret = td_io_getevents(td, min_events, td->cur_depth, tvp);
 	if (ret < 0) {