Fix Solaris compile

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

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 5029d38f356e5983992bb58ae04cfffa77773a5d..c0d3c30f82ba2e93b458d96bb1c5d9ef238eafd8 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -2,16 +2,24 @@
 #define FIO_OS_SOLARIS_H
 
 #include <errno.h>
+#include <malloc.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
 #include <sys/pset.h>
+#include <sys/mman.h>
+#include <sys/dkio.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_FDATASYNC
+#define FIO_HAVE_CHARDEV_SIZE
+#define FIO_USE_GENERIC_BDEV_SIZE
+#define FIO_HAVE_GETTID
 
 #define OS_MAP_ANON            MAP_ANON
 #define OS_RAND_MAX            2147483648UL
@@ -20,23 +28,32 @@ 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
+
 typedef psetid_t os_cpu_mask_t;
 typedef struct solaris_rand_seed os_random_state_t;
 
-static inline int blockdev_size(int fd, unsigned long long *bytes)
+static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)
 {
-       off_t end = lseek(fd, 0, SEEK_END);
+       struct dk_minfo info;
+
+       *bytes = 0;
 
-       if (end < 0)
+       if (ioctl(f->fd, DKIOCGMEDIAINFO, &info) < 0)
                return errno;
 
-       *bytes = end;
+       *bytes = info.dki_lbsize * info.dki_capacity;
        return 0;
 }
 
-static inline int blockdev_invalidate_cache(int fd)
+static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
-       return EINVAL;
+       return 0;
 }
 
 static inline unsigned long long os_phys_mem(void)
@@ -103,6 +120,11 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
        return 0;
 }
 
+static inline int gettid(void)
+{
+       return pthread_self();
+}
+
 /*
  * Should be enough, not aware of what (if any) restrictions Solaris has
  */