rand: add rand64_between()

[fio.git] / lib / rand.h

diff --git a/lib/rand.h b/lib/rand.h
index 24fac23cfec0856b409405e69a313dc7e873be33..6be53072a64751c4ae864a439e33a374205e3c4b 100644 (file)
--- a/lib/rand.h
+++ b/lib/rand.h
@@ -2,8 +2,8 @@
 #define FIO_RAND_H
 
 #include <inttypes.h>
+#include <assert.h>
 #include "types.h"
-#include "../arch/arch.h"
 
 #define FRAND32_MAX    (-1U)
 #define FRAND64_MAX    (-1ULL)
@@ -24,10 +24,6 @@ struct frand_state {
        };
 };
 
-struct frand64_state {
-       uint64_t s1, s2, s3, s4, s5;
-};
-
 static inline uint64_t rand_max(struct frand_state *state)
 {
        if (state->use64)
@@ -121,12 +117,32 @@ static inline double __rand_0_1(struct frand_state *state)
 /*
  * Generate a random value between 'start' and 'end', both inclusive
  */
-static inline int rand_between(struct frand_state *state, int start, int end)
+static inline int rand32_between(struct frand_state *state, int start, int end)
+{
+       uint32_t r;
+
+       assert(!state->use64);
+
+       r = __rand32(&state->state32);
+       return start + (int) ((double)end * (r / (FRAND32_MAX + 1.0)));
+}
+
+static inline uint64_t rand64_between(struct frand_state *state, uint64_t start,
+                                     uint64_t end)
 {
        uint64_t r;
 
-       r = __rand(state);
-       return start + (int) ((double)end * (r / (rand_max(state) + 1.0)));
+       r = __rand64(&state->state64);
+       return start + (uint64_t) ((double)end * (r / (FRAND64_MAX + 1.0)));
+}
+
+static inline uint64_t rand_between(struct frand_state *state, uint64_t start,
+                                   uint64_t end)
+{
+       if (state->use64)
+               return rand32_between(state, start, end);
+       else
+               return rand64_between(state, start, end);
 }
 
 extern void init_rand(struct frand_state *, bool);