X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-solaris.h;h=e6612118ace4baf7afcae38eb9a7126ca45af10e;hb=428b4f6ba681dbb40c8e2213d0c6ae8f8049dcd5;hp=681d4a60729e5f8207c79c9a0fc9ac41ede3c72e;hpb=3f77f72359e90175d86d549e82c9b2a3488df6dc;p=fio.git diff --git a/os/os-solaris.h b/os/os-solaris.h index 681d4a60..e6612118 100644 --- a/os/os-solaris.h +++ b/os/os-solaris.h @@ -1,6 +1,8 @@ #ifndef FIO_OS_SOLARIS_H #define FIO_OS_SOLARIS_H +#define FIO_OS os_solaris + #include #include #include @@ -8,21 +10,24 @@ #include #include #include +#include #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_FDATASYNC #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_swap16(x) BSWAP_16(x) +#define fio_swap32(x) BSWAP_32(x) +#define fio_swap64(x) BSWAP_64(x) + struct solaris_rand_seed { unsigned short r[3]; }; @@ -34,6 +39,9 @@ struct solaris_rand_seed { #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; @@ -97,28 +105,25 @@ static inline int fio_set_odirect(int fd) 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 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 0; } +static inline int gettid(void) +{ + return pthread_self(); +} + /* * Should be enough, not aware of what (if any) restrictions Solaris has */