projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixup bad logging types
[fio.git]
/
os
/
os-solaris.h
diff --git
a/os/os-solaris.h
b/os/os-solaris.h
index ef37e499c26105e96ce16740c62198340384d7eb..e6612118ace4baf7afcae38eb9a7126ca45af10e 100644
(file)
--- a/
os/os-solaris.h
+++ b/
os/os-solaris.h
@@
-1,6
+1,8
@@
#ifndef FIO_OS_SOLARIS_H
#define FIO_OS_SOLARIS_H
#ifndef FIO_OS_SOLARIS_H
#define FIO_OS_SOLARIS_H
+#define FIO_OS os_solaris
+
#include <errno.h>
#include <malloc.h>
#include <sys/types.h>
#include <errno.h>
#include <malloc.h>
#include <sys/types.h>
@@
-12,25
+14,16
@@
#include "../file.h"
#include "../file.h"
-#define FIO_HAVE_POSIXAIO
-#define FIO_HAVE_SOLARISAIO
-#define FIO_HAVE_POSIXAIO_FSYNC
#define FIO_HAVE_CPU_AFFINITY
#define FIO_HAVE_PSHARED_MUTEX
#define FIO_HAVE_CPU_AFFINITY
#define FIO_HAVE_PSHARED_MUTEX
-#define FIO_HAVE_FDATASYNC
#define FIO_HAVE_CHARDEV_SIZE
#define FIO_USE_GENERIC_BDEV_SIZE
#define FIO_HAVE_CHARDEV_SIZE
#define FIO_USE_GENERIC_BDEV_SIZE
+#define FIO_USE_GENERIC_INIT_RANDOM_STATE
#define FIO_HAVE_GETTID
#define OS_MAP_ANON MAP_ANON
#define OS_RAND_MAX 2147483648UL
#define FIO_HAVE_GETTID
#define OS_MAP_ANON MAP_ANON
#define OS_RAND_MAX 2147483648UL
-#if defined(_BIG_ENDIAN)
-#define FIO_BIG_ENDIAN
-#else
-#define FIO_LITTLE_ENDIAN
-#endif
-
#define fio_swap16(x) BSWAP_16(x)
#define fio_swap32(x) BSWAP_32(x)
#define fio_swap64(x) BSWAP_64(x)
#define fio_swap16(x) BSWAP_16(x)
#define fio_swap32(x) BSWAP_32(x)
#define fio_swap64(x) BSWAP_64(x)
@@
-46,6
+39,9
@@
struct solaris_rand_seed {
#define POSIX_MADV_RANDOM MADV_RANDOM
#endif
#define POSIX_MADV_RANDOM MADV_RANDOM
#endif
+#define os_ctime_r(x, y, z) ctime_r((x), (y), (z))
+#define FIO_OS_HAS_CTIME_R
+
typedef psetid_t os_cpu_mask_t;
typedef struct solaris_rand_seed os_random_state_t;
typedef psetid_t os_cpu_mask_t;
typedef struct solaris_rand_seed os_random_state_t;
@@
-109,24
+105,16
@@
static inline int fio_set_odirect(int fd)
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
{
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
{
- int ret;
-
- if (pset_create(mask) < 0) {
- ret = errno;
+ if (pset_create(mask) < 0)
return -1;
return -1;
- }
return 0;
}
static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
{
return 0;
}
static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
{
- int ret;
-
- if (pset_destroy(*mask) < 0) {
- ret = errno;
+ if (pset_destroy(*mask) < 0)
return -1;
return -1;
- }
return 0;
}
return 0;
}