rand: cleanup rand_between() and helpers

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 633f6175170f4c88004c71fa14e756cf55d22480..580c414622db161fe78061413ac5bef6de7e0efb 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -168,7 +168,7 @@ bail:
        /*
         * Generate a value, v, between 1 and 100, both inclusive
         */
-       v = rand32_between(&td->zone_state, 1, 100);
+       v = rand_between(&td->zone_state, 1, 100);
 
        /*
         * Find our generated table. 'send' is the end block of this zone,
@@ -225,7 +225,7 @@ bail:
        /*
         * Generate a value, v, between 1 and 100, both inclusive
         */
-       v = rand32_between(&td->zone_state, 1, 100);
+       v = rand_between(&td->zone_state, 1, 100);
 
        zsi = &td->zone_state_index[ddir][v - 1];
        stotal = zsi->size_perc_prev;
@@ -300,7 +300,7 @@ static bool should_do_random(struct thread_data *td, enum fio_ddir ddir)
        if (td->o.perc_rand[ddir] == 100)
                return true;
 
-       v = rand32_between(&td->seq_rand_state[ddir], 1, 100);
+       v = rand_between(&td->seq_rand_state[ddir], 1, 100);
 
        return v <= td->o.perc_rand[ddir];
 }
@@ -325,9 +325,9 @@ static int get_next_rand_block(struct thread_data *td, struct fio_file *f,
        if (td->o.time_based ||
            (td->o.file_service_type & __FIO_FSERVICE_NONUNIFORM)) {
                fio_file_reset(td, f);
+               loop_cache_invalidate(td, f);
                if (!get_next_rand_offset(td, f, ddir, b))
                        return 0;
-               loop_cache_invalidate(td, f);
        }
 
        dprint(FD_IO, "%s: rand offset failed, last=%llu, size=%llu\n",
@@ -589,7 +589,7 @@ static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
 {
        unsigned int v;
 
-       v = rand32_between(&td->rwmix_state, 1, 100);
+       v = rand_between(&td->rwmix_state, 1, 100);
 
        if (v <= td->o.rwmix[DDIR_READ])
                return DDIR_READ;
@@ -610,11 +610,8 @@ int io_u_quiesce(struct thread_data *td)
         * io's that have been actually submitted to an async engine,
         * and cur_depth is meaningless for sync engines.
         */
-       if (td->io_u_queued || td->cur_depth) {
-               int fio_unused ret;
-
-               ret = td_io_commit(td);
-       }
+       if (td->io_u_queued || td->cur_depth)
+               td_io_commit(td);
 
        while (td->io_u_in_flight) {
                int ret;
@@ -2072,7 +2069,7 @@ static struct frand_state *get_buf_state(struct thread_data *td)
                return &td->buf_state;
        }
 
-       v = rand32_between(&td->dedupe_state, 1, 100);
+       v = rand_between(&td->dedupe_state, 1, 100);
 
        if (v <= td->o.dedupe_percentage)
                return &td->buf_state_prev;