nvme: add nvme opcodes, structures and helper functions

[fio.git] / lib / rand.c

diff --git a/lib/rand.c b/lib/rand.c
index 9c3e0d6a39e181149ad04ac5c36f7220d115de95..6e893e80ba00a4939116cb59099e881300aaed3e 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -34,9 +34,8 @@
 */
 
 #include <string.h>
-#include <assert.h>
 #include "rand.h"
-#include "lib/pattern.h"
+#include "pattern.h"
 #include "../hash.h"
 
 int arch_random;
@@ -60,7 +59,7 @@ static void __init_rand32(struct taus88_state *state, unsigned int seed)
                __rand32(state);
 }
 
-static void __init_rand64(struct taus258_state *state, uint64_t seed)
+void __init_rand64(struct taus258_state *state, uint64_t seed)
 {
        int cranks = 6;
 
@@ -86,17 +85,17 @@ void init_rand(struct frand_state *state, bool use64)
                __init_rand64(&state->state64, 1);
 }
 
-void init_rand_seed(struct frand_state *state, unsigned int seed, bool use64)
+void init_rand_seed(struct frand_state *state, uint64_t seed, bool use64)
 {
        state->use64 = use64;
 
        if (!use64)
-               __init_rand32(&state->state32, seed);
+               __init_rand32(&state->state32, (unsigned int) seed);
        else
                __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;
 
@@ -123,19 +122,16 @@ 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);
-
-       if (sizeof(int) != sizeof(long *))
-               r *= (unsigned long) __rand(fs);
+       uint64_t r = __get_next_seed(fs);
 
        __fill_random_buf(buf, len, r);
        return r;
 }
 
-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)
@@ -157,7 +153,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;
 
@@ -167,6 +163,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;
@@ -183,15 +180,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);
-
-       if (sizeof(int) != sizeof(long *))
-               r *= (unsigned long) __rand(fs);
+       uint64_t r = __get_next_seed(fs);
 
        __fill_random_buf_percentage(r, buf, percentage, segment, len,
                                        pattern, pbytes);