rand: use bools

[fio.git] / lib / rand.c

diff --git a/lib/rand.c b/lib/rand.c
index 618a2f06349dbc90389971b8720c9ea067024e28..9c3e0d6a39e181149ad04ac5c36f7220d115de95 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -36,14 +36,17 @@
 #include <string.h>
 #include <assert.h>
 #include "rand.h"
+#include "lib/pattern.h"
 #include "../hash.h"
 
-static inline int __seed(unsigned int x, unsigned int m)
+int arch_random;
+
+static inline uint64_t __seed(uint64_t x, uint64_t m)
 {
        return (x < m) ? x + m : x;
 }
 
-static void __init_rand(struct frand_state *state, unsigned int seed)
+static void __init_rand32(struct taus88_state *state, unsigned int seed)
 {
        int cranks = 6;
 
@@ -54,26 +57,67 @@ static void __init_rand(struct frand_state *state, unsigned int seed)
        state->s3 = __seed(LCG(state->s2, seed), 15);
 
        while (cranks--)
-               __rand(state);
+               __rand32(state);
 }
 
-void init_rand(struct frand_state *state)
+static void __init_rand64(struct taus258_state *state, uint64_t seed)
 {
-       __init_rand(state, 1);
+       int cranks = 6;
+
+#define LCG64(x, seed)  ((x) * 6906969069ULL ^ (seed))
+
+       state->s1 = __seed(LCG64((2^31) + (2^17) + (2^7), seed), 1);
+       state->s2 = __seed(LCG64(state->s1, seed), 7);
+       state->s3 = __seed(LCG64(state->s2, seed), 15);
+       state->s4 = __seed(LCG64(state->s3, seed), 33);
+       state->s5 = __seed(LCG64(state->s4, seed), 49);
+
+       while (cranks--)
+               __rand64(state);
 }
 
-void init_rand_seed(struct frand_state *state, unsigned int seed)
+void init_rand(struct frand_state *state, bool use64)
 {
-       __init_rand(state, seed);
+       state->use64 = use64;
+
+       if (!use64)
+               __init_rand32(&state->state32, 1);
+       else
+               __init_rand64(&state->state64, 1);
+}
+
+void init_rand_seed(struct frand_state *state, unsigned int seed, bool use64)
+{
+       state->use64 = use64;
+
+       if (!use64)
+               __init_rand32(&state->state32, seed);
+       else
+               __init_rand64(&state->state64, seed);
 }
 
 void __fill_random_buf(void *buf, unsigned int len, unsigned long seed)
 {
-       long *ptr = buf;
+       void *ptr = buf;
 
-       while ((void *) ptr - buf < len) {
-               *ptr = seed;
-               ptr++;
+       while (len) {
+               int this_len;
+
+               if (len >= sizeof(int64_t)) {
+                       *((int64_t *) ptr) = seed;
+                       this_len = sizeof(int64_t);
+               } else if (len >= sizeof(int32_t)) {
+                       *((int32_t *) ptr) = seed;
+                       this_len = sizeof(int32_t);
+               } else if (len >= sizeof(int16_t)) {
+                       *((int16_t *) ptr) = seed;
+                       this_len = sizeof(int16_t);
+               } else {
+                       *((int8_t *) ptr) = seed;
+                       this_len = sizeof(int8_t);
+               }
+               ptr += this_len;
+               len -= this_len;
                seed *= GOLDEN_RATIO_PRIME;
                seed >>= 3;
        }
@@ -91,32 +135,6 @@ unsigned long fill_random_buf(struct frand_state *fs, void *buf,
        return r;
 }
 
-void fill_pattern(void *p, unsigned int len, char *pattern,
-                 unsigned int pattern_bytes)
-{
-       switch (pattern_bytes) {
-       case 0:
-               assert(0);
-               break;
-       case 1:
-               memset(p, pattern[0], len);
-               break;
-       default: {
-               unsigned int i = 0, size = 0;
-               unsigned char *b = p;
-
-               while (i < len) {
-                       size = pattern_bytes;
-                       if (size > (len - i))
-                               size = len - i;
-                       memcpy(b+i, pattern, size);
-                       i += size;
-               }
-               break;
-               }
-       }
-}
-
 void __fill_random_buf_percentage(unsigned long seed, void *buf,
                                  unsigned int percentage,
                                  unsigned int segment, unsigned int len,
@@ -126,7 +144,7 @@ void __fill_random_buf_percentage(unsigned long seed, void *buf,
 
        if (percentage == 100) {
                if (pbytes)
-                       fill_pattern(buf, len, pattern, pbytes);
+                       (void)cpy_pattern(pattern, pbytes, buf, len);
                else
                        memset(buf, 0, len);
                return;
@@ -146,13 +164,17 @@ void __fill_random_buf_percentage(unsigned long seed, void *buf,
                __fill_random_buf(buf, this_len, seed);
 
                len -= this_len;
+               if (!len)
+                       break;
                buf += this_len;
 
                if (this_len > len)
                        this_len = len;
+               else if (len - this_len <= sizeof(long))
+                       this_len = len;
 
                if (pbytes)
-                       fill_pattern(buf, this_len, pattern, pbytes);
+                       (void)cpy_pattern(pattern, pbytes, buf, this_len);
                else
                        memset(buf, 0, this_len);