Add OS agnostic RAND_MAX

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/filesetup.c b/filesetup.c
index 0b297641b11da6277b2b2c753c8d8cd6ccf11468..96d1b54f0a0f5bd6f6851b629e6f1e584460f5d3 100644 (file)
--- a/filesetup.c
+++ b/filesetup.c
@@ -121,12 +121,12 @@ err:
 
 static unsigned long long get_rand_file_size(struct thread_data *td)
 {
-       unsigned long long ret, size_d;
+       unsigned long long ret, sized;
        long r;
 
        r = os_random_long(&td->file_size_state);
-       size_d = td->o.file_size_high - td->o.file_size_low;
-       ret = (unsigned long long) ((double) size_d * (r / (RAND_MAX + 1.0)));
+       sized = td->o.file_size_high - td->o.file_size_low;
+       ret = (unsigned long long) ((double) sized * (r / (OS_RAND_MAX + 1.0)));
        ret += td->o.file_size_low;
        ret -= (ret % td->o.rw_min_bs);
        return ret;

diff --git a/io_u.c b/io_u.c
index 74c3295b8f1157ee6e9d9cb6d45076bad8082259..3f713671ea66f5017be80534f025af3f940d0531 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -146,7 +146,7 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
                r = os_random_long(&td->random_state);
                dprint(FD_RANDOM, "off rand %llu\n", r);
                *b = (last_block(td, f, ddir) - 1)
-                       * (r / ((unsigned long long) RAND_MAX + 1.0));
+                       * (r / ((unsigned long long) OS_RAND_MAX + 1.0));
 
                /*
                 * if we are not maintaining a random map, we are done.
@@ -171,7 +171,8 @@ static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
         */
        loops = 10;
        do {
-               f->last_free_lookup = (f->num_maps - 1) * (r / (RAND_MAX+1.0));
+               f->last_free_lookup = (f->num_maps - 1) *
+                                       (r / (OS_RAND_MAX + 1.0));
                if (!get_next_free_block(td, f, ddir, b))
                        return 0;
 
@@ -240,7 +241,7 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
                if (!td->o.bssplit_nr) {
                        buflen = (unsigned int)
                                        (1 + (double) (td->o.max_bs[ddir] - 1)
-                                       * r / (RAND_MAX + 1.0));
+                                       * r / (OS_RAND_MAX + 1.0));
                } else {
                        long perc = 0;
                        unsigned int i;
@@ -288,7 +289,7 @@ static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
        long r;
 
        r = os_random_long(&td->rwmix_state);
-       v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0)));
+       v = 1 + (int) (100.0 * (r / (OS_RAND_MAX + 1.0)));
        if (v <= td->o.rwmix[DDIR_READ])
                return DDIR_READ;
 
@@ -620,7 +621,7 @@ static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
                long r = os_random_long(&td->next_file_state);
 
                fno = (unsigned int) ((double) td->o.nr_files
-                       * (r / (RAND_MAX + 1.0)));
+                       * (r / (OS_RAND_MAX + 1.0)));
                f = td->files[fno];
                if (f->flags & FIO_FILE_DONE)
                        continue;

diff --git a/os/os-freebsd.h b/os/os-freebsd.h
index af5fc9f685125578623fa21810c490ba08743949..614296a4bc8744e8d4395a8abe9ef40eeb89f8d4 100644 (file)
--- a/os/os-freebsd.h
+++ b/os/os-freebsd.h
@@ -6,7 +6,7 @@
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_ODIRECT
 
-#define OS_MAP_ANON            (MAP_ANON)
+#define OS_MAP_ANON            MAP_ANON
 
 typedef unsigned long os_cpu_mask_t;
 typedef unsigned int os_random_state_t;

diff --git a/os/os-linux.h b/os/os-linux.h
index a07db06b2a04c898af2d8320add4a56a8405e5df..72950c0e8894b24c6efbd253a84907948e75c262 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -29,7 +29,7 @@
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
 
-#define OS_MAP_ANON            (MAP_ANONYMOUS)
+#define OS_MAP_ANON            MAP_ANONYMOUS
 
 #ifndef CLOCK_MONOTONIC
 #define CLOCK_MONOTONIC 1

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 9e243e8a82fdb9da4631aabcd88abddd00666280..759f3c1bc2cdfb33018504716cb0163e5ecf0531 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -9,7 +9,8 @@
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
 
-#define OS_MAP_ANON            (MAP_ANON)
+#define OS_MAP_ANON            MAP_ANON
+#define OS_RAND_MAX            2147483648UL
 
 struct solaris_rand_seed {
        unsigned short r[3];

diff --git a/os/os.h b/os/os.h
index 2dfed5e2dc042aeb5546ad9a5be91609749da089..1cff4945bc7bfc5a1e062bfd5c24ee196899cf76 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -68,6 +68,10 @@
 #define FIO_O_NOATIME                  0
 #endif
 
+#ifndef OS_RAND_MAX
+#define OS_RAND_MAX                    RAND_MAX
+#endif
+
 #ifndef FIO_HAVE_RAWBIND
 #define fio_lookup_raw(dev, majdev, mindev)    1
 #endif