X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=006f2c9efd622a30f70b38468183543c90b22558;hp=d6816068063e9a4be50998fd21c6fcd64d1ae49e;hb=ad1f90aa84ba96916d02043958ee416a499f3f25;hpb=51ede0b1e9c9b570b942b50b44d0455183a0d5ec

diff --git a/io_u.c b/io_u.c
index d6816068..006f2c9e 100644
--- a/io_u.c
+++ b/io_u.c
@@ -10,7 +10,7 @@
 #include "verify.h"
 #include "trim.h"
 #include "lib/rand.h"
-#include "lib/bitmap.h"
+#include "lib/axmap.h"
 
 struct io_completion_data {
 	int nr;				/* input */
@@ -21,12 +21,12 @@ struct io_completion_data {
 };
 
 /*
- * The ->io_bitmap contains a map of blocks we have or have not done io
+ * The ->io_axmap 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 fio_file *f, const unsigned long long block)
 {
-	return !bitmap_isset(f->io_bitmap, block);
+	return !axmap_isset(f->io_axmap, block);
 }
 
 /*
@@ -42,7 +42,8 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 	block = (io_u->offset - f->file_offset) / (unsigned long long) min_bs;
 	nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
 
-	nr_blocks = bitmap_set_nr(f->io_bitmap, block, nr_blocks);
+	if (!(io_u->flags & IO_U_F_BUSY_OK))
+		nr_blocks = axmap_set_nr(f->io_axmap, block, nr_blocks);
 
 	if ((nr_blocks * min_bs) < io_u->buflen)
 		io_u->buflen = nr_blocks * min_bs;
@@ -76,25 +77,36 @@ static unsigned long long last_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 rmax, r, lastb;
+	unsigned long long r;
 
-	lastb = last_block(td, f, ddir);
-	if (!lastb)
-		return 1;
+	if (td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE) {
+		unsigned long long rmax, lastb;
 
-	rmax = td->o.use_os_rand ? OS_RAND_MAX : FRAND_MAX;
+		lastb = last_block(td, f, ddir);
+		if (!lastb)
+			return 1;
 
-	if (td->o.use_os_rand) {
-		rmax = OS_RAND_MAX;
-		r = os_random_long(&td->random_state);
+		rmax = td->o.use_os_rand ? OS_RAND_MAX : FRAND_MAX;
+
+		if (td->o.use_os_rand) {
+			rmax = OS_RAND_MAX;
+			r = os_random_long(&td->random_state);
+		} else {
+			rmax = FRAND_MAX;
+			r = __rand(&td->__random_state);
+		}
+
+		dprint(FD_RANDOM, "off rand %llu\n", r);
+
+		*b = (lastb - 1) * (r / ((unsigned long long) rmax + 1.0));
 	} else {
-		rmax = FRAND_MAX;
-		r = __rand(&td->__random_state);
-	}
+		uint64_t off = 0;
 
-	*b = (lastb - 1) * (r / ((unsigned long long) rmax + 1.0));
+		if (lfsr_next(&f->lfsr, &off))
+			return 1;
 
-	dprint(FD_RANDOM, "off rand %llu\n", r);
+		*b = off;
+	}
 
 	/*
 	 * if we are not maintaining a random map, we are done.
@@ -110,7 +122,7 @@ static int __get_next_rand_offset(struct thread_data *td, struct fio_file *f,
 
 	dprint(FD_RANDOM, "get_next_rand_offset: offset %llu busy\n", *b);
 
-	*b = bitmap_next_free(f->io_bitmap, *b);
+	*b = axmap_next_free(f->io_axmap, *b);
 	if (*b == (uint64_t) -1ULL)
 		return 1;
 ret: