Fix overlap io_u into outside regions

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 5a3ca7444946751f4e208a32affdad5fb98051b9..51da223d3e02ab194c45a77e6249870d9d0a62d4 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -168,9 +168,16 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
                goto ffz;
 
        do {
-               r = os_random_long(&td->random_state);
+               if (td->o.use_os_rand) {
+                       r = os_random_long(&td->random_state);
+                       *b = (lastb - 1) * (r / ((unsigned long long) OS_RAND_MAX + 1.0));
+               } else {
+                       r = __rand(&td->__random_state);
+                       *b = (lastb - 1) * (r / ((unsigned long long) FRAND_MAX + 1.0));
+               }
+
                dprint(FD_RANDOM, "off rand %llu\n", r);
-               *b = (lastb - 1) * (r / ((unsigned long long) OS_RAND_MAX + 1.0));
+
 
                /*
                 * if we are not maintaining a random map, we are done.
@@ -203,7 +210,10 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
                if (!get_next_free_block(td, f, ddir, b))
                        goto ret;
 
-               r = os_random_long(&td->random_state);
+               if (td->o.use_os_rand)
+                       r = os_random_long(&td->random_state);
+               else
+                       r = __rand(&td->__random_state);
        } while (--loops);
 
        /*
@@ -331,12 +341,20 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
        return __get_next_offset(td, io_u);
 }
 
+static inline int io_u_fits(struct thread_data *td, struct io_u *io_u,
+                           unsigned int buflen)
+{
+       struct fio_file *f = io_u->file;
+
+       return io_u->offset + buflen <= f->io_size + td->o.start_offset;
+}
+
 static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
 {
        const int ddir = io_u->ddir;
        unsigned int uninitialized_var(buflen);
        unsigned int minbs, maxbs;
-       long r;
+       unsigned long r, rand_max;
 
        assert(ddir_rw(ddir));
 
@@ -344,12 +362,22 @@ static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
        maxbs = td->o.max_bs[ddir];
 
        if (minbs == maxbs)
-               buflen = minbs;
-       else {
-               r = os_random_long(&td->bsrange_state);
+               return minbs;
+
+       if (td->o.use_os_rand)
+               rand_max = OS_RAND_MAX;
+       else
+               rand_max = FRAND_MAX;
+
+       do {
+               if (td->o.use_os_rand)
+                       r = os_random_long(&td->bsrange_state);
+               else
+                       r = __rand(&td->__bsrange_state);
+
                if (!td->o.bssplit_nr[ddir]) {
                        buflen = 1 + (unsigned int) ((double) maxbs *
-                                       (r / (OS_RAND_MAX + 1.0)));
+                                       (r / (rand_max + 1.0)));
                        if (buflen < minbs)
                                buflen = minbs;
                } else {
@@ -361,19 +389,16 @@ static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
 
                                buflen = bsp->bs;
                                perc += bsp->perc;
-                               if (r <= ((OS_RAND_MAX / 100L) * perc))
+                               if ((r <= ((rand_max / 100L) * perc)) &&
+                                   io_u_fits(td, io_u, buflen))
                                        break;
                        }
                }
+
                if (!td->o.bs_unaligned && is_power_of_2(minbs))
                        buflen = (buflen + minbs - 1) & ~(minbs - 1);
-       }
 
-       if (io_u->offset + buflen > io_u->file->real_file_size) {
-               dprint(FD_IO, "lower buflen %u -> %u (ddir=%d)\n", buflen,
-                                               minbs, ddir);
-               buflen = minbs;
-       }
+       } while (!io_u_fits(td, io_u, buflen));
 
        return buflen;
 }
@@ -404,10 +429,16 @@ static void set_rwmix_bytes(struct thread_data *td)
 static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
 {
        unsigned int v;
-       long r;
+       unsigned long r;
+
+       if (td->o.use_os_rand) {
+               r = os_random_long(&td->rwmix_state);
+               v = 1 + (int) (100.0 * (r / (OS_RAND_MAX + 1.0)));
+       } else {
+               r = __rand(&td->__rwmix_state);
+               v = 1 + (int) (100.0 * (r / (FRAND_MAX + 1.0)));
+       }
 
-       r = os_random_long(&td->rwmix_state);
-       v = 1 + (int) (100.0 * (r / (OS_RAND_MAX + 1.0)));
        if (v <= td->o.rwmix[DDIR_READ])
                return DDIR_READ;
 
@@ -823,11 +854,19 @@ static struct fio_file *get_next_file_rand(struct thread_data *td,
        int fno;
 
        do {
-               long r = os_random_long(&td->next_file_state);
                int opened = 0;
+               unsigned long r;
+
+               if (td->o.use_os_rand) {
+                       r = os_random_long(&td->next_file_state);
+                       fno = (unsigned int) ((double) td->o.nr_files
+                               * (r / (OS_RAND_MAX + 1.0)));
+               } else {
+                       r = __rand(&td->__next_file_state);
+                       fno = (unsigned int) ((double) td->o.nr_files
+                               * (r / (FRAND_MAX + 1.0)));
+               }
 
-               fno = (unsigned int) ((double) td->o.nr_files
-                       * (r / (OS_RAND_MAX + 1.0)));
                f = td->files[fno];
                if (fio_file_done(f))
                        continue;