Fio 2.8

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

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 3e82543695de88d94797b0640030418368382e1a..5b78cc2cc43cb384fb8d5e6e1f952bd6f618c1b6 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,36 +1,67 @@
 #ifndef FIO_OS_SOLARIS_H
 #define FIO_OS_SOLARIS_H
 
+#define        FIO_OS  os_solaris
+
 #include <errno.h>
 #include <malloc.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/pset.h>
+#include <sys/mman.h>
+#include <sys/dkio.h>
+#include <sys/byteorder.h>
 
 #include "../file.h"
 
-#define FIO_HAVE_POSIXAIO
-#define FIO_HAVE_SOLARISAIO
-#define FIO_HAVE_FALLOCATE
-#define FIO_HAVE_POSIXAIO_FSYNC
 #define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_PSHARED_MUTEX
+#define FIO_HAVE_CHARDEV_SIZE
 #define FIO_USE_GENERIC_BDEV_SIZE
-#define FIO_HAVE_FDATASYNC
+#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];
 };
 
+#ifndef POSIX_MADV_SEQUENTIAL
+#define posix_madvise  madvise
+#define POSIX_MADV_SEQUENTIAL  MADV_SEQUENTIAL
+#define POSIX_MADV_DONTNEED    MADV_DONTNEED
+#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;
 
+static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
+{
+       struct dk_minfo info;
+
+       *bytes = 0;
+
+       if (ioctl(f->fd, DKIOCGMEDIAINFO, &info) < 0)
+               return errno;
+
+       *bytes = info.dki_lbsize * info.dki_capacity;
+       return 0;
+}
+
 static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-       return EINVAL;
+       return 0;
 }
 
 static inline unsigned long long os_phys_mem(void)
@@ -73,30 +104,63 @@ static inline int fio_set_odirect(int fd)
 #define fio_cpu_clear(mask, cpu)       pset_assign(PS_NONE, (cpu), NULL)
 #define fio_cpu_set(mask, cpu)         pset_assign(*(mask), (cpu), NULL)
 
-static inline int fio_cpuset_init(os_cpu_mask_t *mask)
+static inline int fio_cpu_isset(os_cpu_mask_t *mask, int cpu)
 {
-       int ret;
+       const unsigned int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+       unsigned int num_cpus;
+       processorid_t *cpus;
+       int i, ret;
 
-       if (pset_create(mask) < 0) {
-               ret = errno;
-               return -1;
+       cpus = malloc(sizeof(*cpus) * max_cpus);
+
+       if (pset_info(*mask, NULL, &num_cpus, cpus) < 0) {
+               free(cpus);
+               return 0;
        }
 
+       ret = 0;
+       for (i = 0; i < num_cpus; i++) {
+               if (cpus[i] == cpu) {
+                       ret = 1;
+                       break;
+               }
+       }
+
+       free(cpus);
+       return ret;
+}
+
+static inline int fio_cpu_count(os_cpu_mask_t *mask)
+{
+       unsigned int num_cpus;
+
+       if (pset_info(*mask, NULL, &num_cpus, NULL) < 0)
+               return 0;
+
+       return num_cpus;
+}
+
+static inline int fio_cpuset_init(os_cpu_mask_t *mask)
+{
+       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
  */