Fio 3.14

[fio.git] / lib / rand.c

diff --git a/lib/rand.c b/lib/rand.c
index 2e4c66e144b5cc56a04ec8c4747e435368b68a3a..69acb06c14410296f959da96f27fe842f57eede1 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -34,8 +34,8 @@
 */
 
 #include <string.h>
-#include <assert.h>
 #include "rand.h"
+#include "pattern.h"
 #include "../hash.h"
 
 int arch_random;
@@ -75,7 +75,7 @@ static void __init_rand64(struct taus258_state *state, uint64_t seed)
                __rand64(state);
 }
 
-void init_rand(struct frand_state *state, int use64)
+void init_rand(struct frand_state *state, bool use64)
 {
        state->use64 = use64;
 
@@ -85,7 +85,7 @@ void init_rand(struct frand_state *state, int use64)
                __init_rand64(&state->state64, 1);
 }
 
-void init_rand_seed(struct frand_state *state, unsigned int seed, int use64)
+void init_rand_seed(struct frand_state *state, unsigned int seed, bool use64)
 {
        state->use64 = use64;
 
@@ -95,7 +95,7 @@ void init_rand_seed(struct frand_state *state, unsigned int seed, int use64)
                __init_rand64(&state->state64, seed);
 }
 
-void __fill_random_buf(void *buf, unsigned int len, unsigned long seed)
+void __fill_random_buf(void *buf, unsigned int len, uint64_t seed)
 {
        void *ptr = buf;
 
@@ -122,10 +122,10 @@ void __fill_random_buf(void *buf, unsigned int len, unsigned long seed)
        }
 }
 
-unsigned long fill_random_buf(struct frand_state *fs, void *buf,
-                             unsigned int len)
+uint64_t fill_random_buf(struct frand_state *fs, void *buf,
+                        unsigned int len)
 {
-       unsigned long r = __rand(fs);
+       uint64_t r = __rand(fs);
 
        if (sizeof(int) != sizeof(long *))
                r *= (unsigned long) __rand(fs);
@@ -134,33 +134,7 @@ 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,
+void __fill_random_buf_percentage(uint64_t seed, void *buf,
                                  unsigned int percentage,
                                  unsigned int segment, unsigned int len,
                                  char *pattern, unsigned int pbytes)
@@ -169,7 +143,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;
@@ -182,7 +156,7 @@ void __fill_random_buf_percentage(unsigned long seed, void *buf,
                /*
                 * Fill random chunk
                 */
-               this_len = (segment * (100 - percentage)) / 100;
+               this_len = ((unsigned long long)segment * (100 - percentage)) / 100;
                if (this_len > len)
                        this_len = len;
 
@@ -192,6 +166,7 @@ void __fill_random_buf_percentage(unsigned long seed, void *buf,
                if (!len)
                        break;
                buf += this_len;
+               this_len = segment - this_len;
 
                if (this_len > len)
                        this_len = len;
@@ -199,7 +174,7 @@ void __fill_random_buf_percentage(unsigned long seed, void *buf,
                        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);
 
@@ -208,12 +183,12 @@ void __fill_random_buf_percentage(unsigned long seed, void *buf,
        }
 }
 
-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)
+uint64_t 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);
+       uint64_t r = __rand(fs);
 
        if (sizeof(int) != sizeof(long *))
                r *= (unsigned long) __rand(fs);