lib/rand: cleanup __fill_random_buffer()

[fio.git] / lib / rand.c

diff --git a/lib/rand.c b/lib/rand.c
index e5332bfe792492651e7685c4cd35595ca981ddf0..185b679e7c1365956cd80e40d433dc8fa41a951e 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -69,11 +69,26 @@ void init_rand_seed(struct frand_state *state, unsigned int 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;
        }
@@ -117,12 +132,11 @@ void fill_pattern(void *p, unsigned int len, char *pattern,
        }
 }
 
-unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
-                                        unsigned int percentage,
-                                        unsigned int segment, unsigned int len,
-                                        char *pattern, unsigned int pbytes)
+void __fill_random_buf_percentage(unsigned long seed, void *buf,
+                                 unsigned int percentage,
+                                 unsigned int segment, unsigned int len,
+                                 char *pattern, unsigned int pbytes)
 {
-       unsigned long r = __rand(fs);
        unsigned int this_len;
 
        if (percentage == 100) {
@@ -130,15 +144,12 @@ unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
                        fill_pattern(buf, len, pattern, pbytes);
                else
                        memset(buf, 0, len);
-               return 0;
+               return;
        }
 
        if (segment > len)
                segment = len;
 
-       if (sizeof(int) != sizeof(long *))
-               r *= (unsigned long) __rand(fs);
-
        while (len) {
                /*
                 * Fill random chunk
@@ -147,21 +158,39 @@ unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
                if (this_len > len)
                        this_len = len;
 
-               __fill_random_buf(buf, this_len, r);
+               __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);
                else
                        memset(buf, 0, this_len);
+
                len -= this_len;
                buf += this_len;
        }
+}
+
+unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
+                                        unsigned int percentage,
+                                        unsigned int segment, unsigned int len,
+                                        char *pattern, unsigned int pbytes)
+{
+       unsigned long r = __rand(fs);
+
+       if (sizeof(int) != sizeof(long *))
+               r *= (unsigned long) __rand(fs);
 
+       __fill_random_buf_percentage(r, buf, percentage, segment, len,
+                                       pattern, pbytes);
        return r;
 }