-extern void init_rand(struct frand_state *, int);
-extern void init_rand_seed(struct frand_state *, unsigned int seed, int);
+static inline uint32_t rand32_upto(struct frand_state *state, uint32_t end)
+{
+ uint32_t r;
+
+ assert(!state->use64);
+
+ r = __rand32(&state->state32);
+ end++;
+ return (int) ((double)end * (r / (FRAND32_MAX + 1.0)));
+}
+
+static inline uint64_t rand64_upto(struct frand_state *state, uint64_t end)
+{
+ uint64_t r;
+
+ assert(state->use64);
+
+ r = __rand64(&state->state64);
+ end++;
+ return (uint64_t) ((double)end * (r / (FRAND64_MAX + 1.0)));
+}
+
+/*
+ * Generate a random value between 'start' and 'end', both inclusive
+ */
+static inline uint64_t rand_between(struct frand_state *state, uint64_t start,
+ uint64_t end)
+{
+ if (state->use64)
+ return start + rand64_upto(state, end - start);
+ else
+ return start + rand32_upto(state, end - start);
+}
+
+extern void init_rand(struct frand_state *, bool);
+extern void init_rand_seed(struct frand_state *, unsigned int seed, bool);