X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=c56ccc6c614b32737d829aa7b170513affce6bce;hp=834e5d214d5da390365858f36d67ed3fd67127a6;hb=a4a81712f0bd76cbde8898c0b87faedbaa1d2da1;hpb=ee88470c001012d08ae37bfc31741a935be2e7a1

diff --git a/io_u.c b/io_u.c
index 834e5d21..c56ccc6c 100644
--- a/io_u.c
+++ b/io_u.c
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <signal.h>
 #include <time.h>
-#include <assert.h>
 
 #include "fio.h"
 #include "os.h"
@@ -27,13 +26,16 @@ static int random_map_free(struct thread_data *td, struct fio_file *f,
 static void mark_random_map(struct thread_data *td, struct fio_file *f,
 			    struct io_u *io_u)
 {
-	unsigned int min_bs = td->min_bs[io_u->ddir];
+	unsigned int min_bs = td->rw_min_bs;
 	unsigned long long block;
 	unsigned int blocks;
+	unsigned int nr_blocks;
 
 	block = io_u->offset / (unsigned long long) min_bs;
 	blocks = 0;
-	while (blocks < (io_u->buflen / min_bs)) {
+	nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
+
+	while (blocks < nr_blocks) {
 		unsigned int idx, bit;
 
 		if (!random_map_free(td, f, block))
@@ -42,7 +44,7 @@ static void mark_random_map(struct thread_data *td, struct fio_file *f,
 		idx = RAND_MAP_IDX(td, f, block);
 		bit = RAND_MAP_BIT(td, f, block);
 
-		assert(idx < f->num_maps);
+		fio_assert(td, idx < f->num_maps);
 
 		f->file_map[idx] |= (1UL << bit);
 		block++;
@@ -61,11 +63,12 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 {
 	int i;
 
-	*b = 0;
-	i = 0;
+	i = f->last_free_lookup;
+	*b = (i * BLOCKS_PER_MAP);
 	while ((*b) * td->rw_min_bs < f->real_file_size) {
 		if (f->file_map[i] != -1UL) {
 			*b += ffz(f->file_map[i]);
+			f->last_free_lookup = i;
 			return 0;
 		}
 
@@ -82,14 +85,15 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
  * the last io issued.
  */
 static int get_next_offset(struct thread_data *td, struct fio_file *f,
-			   unsigned long long *offset, int ddir)
+			   struct io_u *io_u)
 {
+	const int ddir = io_u->ddir;
 	unsigned long long b, rb;
 	long r;
 
 	if (!td->sequential) {
 		unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
-		int loops = 50;
+		int loops = 5;
 
 		do {
 			r = os_random_long(&td->random_state);
@@ -100,22 +104,26 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
 			loops--;
 		} while (!random_map_free(td, f, rb) && loops);
 
-		if (!loops) {
-			if (get_next_free_block(td, f, &b))
-				return 1;
-		}
+		/*
+		 * 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;
 	} else
 		b = f->last_pos / td->min_bs[ddir];
 
-	*offset = (b * td->min_bs[ddir]) + f->file_offset;
-	if (*offset > f->real_file_size)
+	io_u->offset = (b * td->min_bs[ddir]) + f->file_offset;
+	if (io_u->offset >= f->real_file_size)
 		return 1;
 
 	return 0;
 }
 
-static unsigned int get_next_buflen(struct thread_data *td, int ddir)
+static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f,
+				    struct io_u *io_u)
 {
+	const int ddir = io_u->ddir;
 	unsigned int buflen;
 	long r;
 
@@ -128,15 +136,11 @@ static unsigned int get_next_buflen(struct thread_data *td, int ddir)
 			buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
 	}
 
-	if (buflen > td->io_size - td->this_io_bytes[ddir]) {
-		/*
-		 * if using direct/raw io, we may not be able to
-		 * shrink the size. so just fail it.
-		 */
-		if (td->io_ops->flags & FIO_RAWIO)
+	while (buflen + io_u->offset > f->real_file_size) {
+		if (buflen == td->min_bs[ddir])
 			return 0;
 
-		buflen = td->io_size - td->this_io_bytes[ddir];
+		buflen = td->min_bs[ddir];
 	}
 
 	return buflen;
@@ -208,23 +212,55 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
 	io_u->ddir = get_rw_ddir(td);
 
 	/*
-	 * No log, let the seq/rand engine retrieve the next position.
+	 * No log, let the seq/rand engine retrieve the next buflen and
+	 * position.
 	 */
-	if (!get_next_offset(td, f, &io_u->offset, io_u->ddir)) {
-		io_u->buflen = get_next_buflen(td, io_u->ddir);
-		if (io_u->buflen) {
-			/*
-			 * If using a write iolog, store this entry.
-			 */
-			if (td->write_iolog_file)
-				write_iolog_put(td, io_u);
-
-			io_u->file = f;
-			return 0;
-		}
+	if (get_next_offset(td, f, io_u))
+		return 1;
+
+	io_u->buflen = get_next_buflen(td, f, io_u);
+	if (!io_u->buflen)
+		return 1;
+
+	/*
+	 * mark entry before potentially trimming io_u
+	 */
+	if (!td->read_iolog && !td->sequential && !td->norandommap)
+		mark_random_map(td, f, io_u);
+
+	/*
+	 * If using a write iolog, store this entry.
+	 */
+	if (td->write_iolog_file)
+		write_iolog_put(td, io_u);
+
+	io_u->file = f;
+	return 0;
+}
+
+static void io_u_mark_depth(struct thread_data *td)
+{
+	int index = 0;
+
+	switch (td->cur_depth) {
+	default:
+		index++;
+	case 32 ... 63:
+		index++;
+	case 16 ... 31:
+		index++;
+	case 8 ... 15:
+		index++;
+	case 4 ... 7:
+		index++;
+	case 2 ... 3:
+		index++;
+	case 1:
+		break;
 	}
 
-	return 1;
+	td->io_u_map[index]++;
+	td->total_io_u++;
 }
 
 struct io_u *__get_io_u(struct thread_data *td)
@@ -240,6 +276,7 @@ struct io_u *__get_io_u(struct thread_data *td)
 		list_del(&io_u->list);
 		list_add(&io_u->list, &td->io_u_busylist);
 		td->cur_depth++;
+		io_u_mark_depth(td);
 	}
 
 	return io_u;
@@ -282,9 +319,6 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 			return NULL;
 		}
 
-		if (!td->read_iolog && !td->sequential && !td->norandommap)
-			mark_random_map(td, f, io_u);
-
 		f->last_pos += io_u->buflen;
 
 		if (td->verify != VERIFY_NONE)
@@ -296,6 +330,12 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 		return NULL;
 	}
 
+	/*
+	 * Set io data pointers.
+	 */
+	io_u->xfer_buf = io_u->buf;
+	io_u->xfer_buflen = io_u->buflen;
+
 	fio_gettime(&io_u->start_time, NULL);
 	return io_u;
 }
@@ -353,5 +393,3 @@ void ios_completed(struct thread_data *td, struct io_completion_data *icd)
 		put_io_u(td, io_u);
 	}
 }
-
-