Remove old OS dependent (unused) random code

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/os/os-aix.h b/os/os-aix.h
index e204d6f27f270f1e63a06809fb4fdaffb2cbe1e4..1aab96e08d40ad9656eaa41ba1626a348bfa0d52 100644 (file)
--- a/os/os-aix.h
+++ b/os/os-aix.h
@@ -11,7 +11,6 @@
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT

-#define FIO_USE_GENERIC_RAND

 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 
 #define OS_MAP_ANON            MAP_ANON
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 
 #define OS_MAP_ANON            MAP_ANON

diff --git a/os/os-android.h b/os/os-android.h
index 1483275e9e631aa751c690995308085a3a47fbca..3c050776249c426a75834e3cb244f3a844cc09aa 100644 (file)
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -201,23 +201,6 @@ static inline unsigned long long os_phys_mem(void)
        return (unsigned long long) pages * (unsigned long long) pagesize;
 }
 
        return (unsigned long long) pages * (unsigned long long) pagesize;
 }
 

-typedef struct { unsigned short r[3]; } os_random_state_t;
-
-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       rs->r[0] = seed & 0xffff;
-       seed >>= 16;
-       rs->r[1] = seed & 0xffff;
-       seed >>= 16;
-       rs->r[2] = seed & 0xffff;
-       seed48(rs->r);
-}
-
-static inline long os_random_long(os_random_state_t *rs)
-{
-       return nrand48(rs->r);
-}
-

 #ifdef O_NOATIME
 #define FIO_O_NOATIME  O_NOATIME
 #else
 #ifdef O_NOATIME
 #define FIO_O_NOATIME  O_NOATIME
 #else

diff --git a/os/os-dragonfly.h b/os/os-dragonfly.h
index e80ad8cd906ea72b4bde0b66b7bc7f2a462487ba..eb92521fa5ed4edab58134f1dbdff17c88fc26a2 100644 (file)
--- a/os/os-dragonfly.h
+++ b/os/os-dragonfly.h
@@ -25,7 +25,6 @@
 #include "../lib/types.h"
 
 #define FIO_HAVE_ODIRECT
 #include "../lib/types.h"
 
 #define FIO_HAVE_ODIRECT

-#define FIO_USE_GENERIC_RAND

 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_TRIM
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_TRIM

diff --git a/os/os-freebsd.h b/os/os-freebsd.h
index 97bc8ae5f4e2658d99d590d90f2919098df7ed96..789da178afa1671bd788be57964c4368ef46ee23 100644 (file)
--- a/os/os-freebsd.h
+++ b/os/os-freebsd.h
@@ -16,7 +16,6 @@
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT

-#define FIO_USE_GENERIC_RAND

 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_CHARDEV_SIZE
 #define FIO_HAVE_FS_STAT
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_CHARDEV_SIZE
 #define FIO_HAVE_FS_STAT

diff --git a/os/os-hpux.h b/os/os-hpux.h
index 515a5256878a1d57f6f2fb651f05c2fa66b2af7b..c1dafe42ee55c0bf2317304daa828e138691e312 100644 (file)
--- a/os/os-hpux.h
+++ b/os/os-hpux.h
@@ -20,7 +20,6 @@
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT

-#define FIO_USE_GENERIC_RAND

 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_CHARDEV_SIZE
 
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_CHARDEV_SIZE
 

diff --git a/os/os-linux.h b/os/os-linux.h
index 6b63d123956afa6f28f20b3e7ff32e583f652e99..ba58bf7d962380413f15441d259eea8573f3c26e 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -60,8 +60,6 @@
 
 typedef cpu_set_t os_cpu_mask_t;
 
 
 typedef cpu_set_t os_cpu_mask_t;
 

-typedef struct drand48_data os_random_state_t;
-

 #ifdef CONFIG_3ARG_AFFINITY
 #define fio_setaffinity(pid, cpumask)          \
        sched_setaffinity((pid), sizeof(cpumask), &(cpumask))
 #ifdef CONFIG_3ARG_AFFINITY
 #define fio_setaffinity(pid, cpumask)          \
        sched_setaffinity((pid), sizeof(cpumask), &(cpumask))


@@ -170,19 +168,6 @@ static inline unsigned long long os_phys_mem(void)
        return (unsigned long long) pages * (unsigned long long) pagesize;
 }
 
        return (unsigned long long) pages * (unsigned long long) pagesize;
 }
 

-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       srand48_r(seed, rs);
-}
-
-static inline long os_random_long(os_random_state_t *rs)
-{
-       long val;
-
-       lrand48_r(rs, &val);
-       return val;
-}
-

 static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 {
        struct raw_config_request rq;
 static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 {
        struct raw_config_request rq;

diff --git a/os/os-mac.h b/os/os-mac.h
index 92a60ee98766f0fc1526cd440e38a687e6cc02ae..0b9c870761df96677a90a80f183a1c850fec2a36 100644 (file)
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -16,7 +16,6 @@
 
 #include "../file.h"
 
 
 #include "../file.h"
 

-#define FIO_USE_GENERIC_RAND

 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_CHARDEV_SIZE
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_CHARDEV_SIZE

diff --git a/os/os-netbsd.h b/os/os-netbsd.h
index 682a11c95f1ccb91df421e424923dbd2c9703761..c06261d4a2a8407d7d7640df6c19d38a4e9f60a3 100644 (file)
--- a/os/os-netbsd.h
+++ b/os/os-netbsd.h
@@ -21,7 +21,6 @@
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT
 #include "../file.h"
 
 #define FIO_HAVE_ODIRECT

-#define FIO_USE_GENERIC_RAND

 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID

diff --git a/os/os-openbsd.h b/os/os-openbsd.h
index b4c02c9bf236803227cdb053f35975bb2b6f26d6..70f58b49ce3572a9f24b414a998ed79e6ab32a49 100644 (file)
--- a/os/os-openbsd.h
+++ b/os/os-openbsd.h
@@ -20,7 +20,6 @@
 
 #include "../file.h"
 
 
 #include "../file.h"
 

-#define FIO_USE_GENERIC_RAND

 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID
 #define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_GETTID

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 2425ab9e0efd9b265e15bc24fa575fe78609ec26..1a411af664e8de947fc0497f59a12648e8d60fe0 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -47,7 +47,6 @@ struct solaris_rand_seed {
 #define FIO_OS_HAS_CTIME_R
 
 typedef psetid_t os_cpu_mask_t;
 #define FIO_OS_HAS_CTIME_R
 
 typedef psetid_t os_cpu_mask_t;

-typedef struct solaris_rand_seed os_random_state_t;

 
 static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
 {
 
 static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
 {


@@ -92,21 +91,6 @@ static inline unsigned long long get_fs_free_size(const char *path)
        return ret;
 }
 
        return ret;
 }
 

-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       rs->r[0] = seed & 0xffff;
-       seed >>= 16;
-       rs->r[1] = seed & 0xffff;
-       seed >>= 16;
-       rs->r[2] = seed & 0xffff;
-       seed48(rs->r);
-}
-
-static inline long os_random_long(os_random_state_t *rs)
-{
-       return nrand48(rs->r);
-}
-

 #define FIO_OS_DIRECTIO
 extern int directio(int, int);
 static inline int fio_set_odirect(struct fio_file *f)
 #define FIO_OS_DIRECTIO
 extern int directio(int, int);
 static inline int fio_set_odirect(struct fio_file *f)

diff --git a/os/os-windows.h b/os/os-windows.h
index aad446e7b71da5f6c8a5846cfe9e8eae5386e5f7..ef955dc36f4fd18fe1cab5f7ffc38da750e1352b 100644 (file)
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -35,7 +35,6 @@ int rand_r(unsigned *);
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_CHARDEV_SIZE
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_CHARDEV_SIZE
 #define FIO_HAVE_GETTID

-#define FIO_USE_GENERIC_RAND

 
 #define FIO_PREFERRED_ENGINE           "windowsaio"
 #define FIO_PREFERRED_CLOCK_SOURCE     CS_CGETTIME
 
 #define FIO_PREFERRED_ENGINE           "windowsaio"
 #define FIO_PREFERRED_CLOCK_SOURCE     CS_CGETTIME

diff --git a/os/os.h b/os/os.h
index becc41033e4a8c8db674abf78b2c9ed42f003c69..0b182c4a6058a5e4e881538ddbb0de55f02a7ca7 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -298,23 +298,6 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 }
 #endif
 
 }
 #endif
 

-#ifdef FIO_USE_GENERIC_RAND
-typedef unsigned int os_random_state_t;
-
-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       srand(seed);
-}
-
-static inline long os_random_long(os_random_state_t *rs)
-{
-       long val;
-
-       val = rand_r(rs);
-       return val;
-}
-#endif
-

 #ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE
 static inline int init_random_seeds(unsigned long *rand_seeds, int size)
 {
 #ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE
 static inline int init_random_seeds(unsigned long *rand_seeds, int size)
 {