From 386501be7e22b6810f1810f0e631c35c95325035 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 12 Jun 2018 08:47:08 -0600 Subject: [PATCH 1/1] init: kill get_rand_start_delay() It's now useless, just call rand_between(). Signed-off-by: Jens Axboe --- init.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/init.c b/init.c index e25e5e48..02793dd8 100644 --- a/init.c +++ b/init.c @@ -574,22 +574,6 @@ static int fixed_block_size(struct thread_options *o) o->min_bs[DDIR_READ] == o->min_bs[DDIR_TRIM]; } - -static unsigned long long get_rand_start_delay(struct thread_data *td) -{ - unsigned long long delayrange; - uint64_t r, frand_max; - - delayrange = td->o.start_delay_high - td->o.start_delay; - - frand_max = rand_max(&td->delay_state); - r = __rand(&td->delay_state); - delayrange = (unsigned long long) ((double) delayrange * (r / (frand_max + 1.0))); - - delayrange += td->o.start_delay_orig; - return delayrange; -} - /* * <3 Johannes */ @@ -687,7 +671,9 @@ static int fixup_options(struct thread_data *td) if (o->start_delay_high) { if (!o->start_delay_orig) o->start_delay_orig = o->start_delay; - o->start_delay = get_rand_start_delay(td); + o->start_delay = rand_between(&td->delay_state, + td->o.start_delay_orig, + td->o.start_delay_high); } if (o->norandommap && o->verify != VERIFY_NONE -- 2.25.1