projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OS agnostic RAND_MAX
[fio.git]
/
os
/
os-solaris.h
diff --git
a/os/os-solaris.h
b/os/os-solaris.h
index ac22bff154d4ecc9ade86d57ba6eb8dd2680d7ab..759f3c1bc2cdfb33018504716cb0163e5ecf0531 100644
(file)
--- a/
os/os-solaris.h
+++ b/
os/os-solaris.h
@@
-1,15
+1,23
@@
#ifndef FIO_OS_SOLARIS_H
#define FIO_OS_SOLARIS_H
#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
#define FIO_HAVE_POSIXAIO_FSYNC
#define FIO_HAVE_POSIXAIO
#define FIO_HAVE_SOLARISAIO
#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];
+};
typedef unsigned long os_cpu_mask_t;
typedef unsigned long os_cpu_mask_t;
-typedef
unsigned int
os_random_state_t;
+typedef
struct solaris_rand_seed
os_random_state_t;
/*
* FIXME
/*
* FIXME
@@
-26,29
+34,32
@@
static inline int blockdev_invalidate_cache(int fd)
static inline unsigned long long os_phys_mem(void)
{
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;
return 0;
-#endif
}
static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
{
}
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)
{
}
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
}
#endif