Merge branch 'master' into gfio

[fio.git] / lib / rand.c

diff --git a/lib/rand.c b/lib/rand.c
index 3b2d67ad6e9ebc4a242b24c162f94aa667a11743..a79fb9c17c321a94e8e4bcfe030193003c80d93f 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -33,11 +33,10 @@
 
 */
 
+#include <string.h>
 #include "rand.h"
 #include "../hash.h"
 
-struct frand_state __fio_rand_state;
-
 static inline int __seed(unsigned int x, unsigned int m)
 {
        return (x < m) ? x + m : x;
@@ -79,13 +78,56 @@ void __fill_random_buf(void *buf, unsigned int len, unsigned long seed)
        }
 }
 
-unsigned long fill_random_buf(void *buf, unsigned int len)
+unsigned long fill_random_buf(struct frand_state *fs, void *buf,
+                             unsigned int len)
 {
-       unsigned long r = __rand(&__fio_rand_state);
+       unsigned long r = __rand(fs);
 
        if (sizeof(int) != sizeof(long *))
-               r *= (unsigned long) __rand(&__fio_rand_state);
+               r *= (unsigned long) __rand(fs);
 
        __fill_random_buf(buf, len, r);
        return r;
 }
+
+unsigned long fill_random_buf_percentage(struct frand_state *fs, void *buf,
+                                        unsigned int percentage,
+                                        unsigned int segment, unsigned int len)
+{
+       unsigned long r = __rand(fs);
+       unsigned int this_len;
+
+       if (percentage == 100) {
+               memset(buf, 0, len);
+               return 0;
+       }
+
+       if (segment > len)
+               segment = len;
+
+       if (sizeof(int) != sizeof(long *))
+               r *= (unsigned long) __rand(fs);
+
+       while (len) {
+               /*
+                * Fill random chunk
+                */
+               this_len = (segment * (100 - percentage)) / 100;
+               if (this_len > len)
+                       this_len = len;
+
+               __fill_random_buf(buf, this_len, r);
+
+               len -= this_len;
+               buf += this_len;
+
+               if (this_len > len)
+                       this_len = len;
+
+               memset(buf, 0, this_len);
+               len -= this_len;
+               buf += this_len;
+       }
+
+       return r;
+}