Solaris: support for proper random functions

[fio.git] / os / os-solaris.h

diff --git a/os/os-solaris.h b/os/os-solaris.h
index ac22bff154d4ecc9ade86d57ba6eb8dd2680d7ab..9e243e8a82fdb9da4631aabcd88abddd00666280 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,6 +1,9 @@
 #ifndef FIO_OS_SOLARIS_H
 #define FIO_OS_SOLARIS_H
 
+#include <sys/types.h>
+#include <sys/fcntl.h>
+
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_SOLARISAIO
 #define FIO_HAVE_FALLOCATE
@@ -8,8 +11,12 @@
 
 #define OS_MAP_ANON            (MAP_ANON)
 
+struct solaris_rand_seed {
+       unsigned short r[3];
+};
+
 typedef unsigned long os_cpu_mask_t;
-typedef unsigned int os_random_state_t;
+typedef struct solaris_rand_seed os_random_state_t;
 
 /*
  * FIXME
@@ -26,29 +33,32 @@ static inline int blockdev_invalidate_cache(int fd)
 
 static inline unsigned long long os_phys_mem(void)
 {
-#if 0
-       int mib[2] = { CTL_HW, HW_PHYSMEM };
-       unsigned long long mem;
-       size_t len = sizeof(mem);
-
-       sysctl(mib, 2, &mem, &len, NULL, 0);
-       return mem;
-#else
        return 0;
-#endif
 }
 
 static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
 {
-       srand(seed);
+       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)
 {
-       long val;
+       return nrand48(rs->r);
+}
 
-       val = rand_r(rs);
-       return val;
+#define FIO_OS_DIRECTIO
+extern int directio(int, int);
+static inline int fio_set_odirect(int fd)
+{
+       if (directio(fd, DIRECTIO_ON) < 0)
+               return errno;
+
+       return 0;
 }
 
 #endif