Add directio support to Solaris

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/ioengines.c b/ioengines.c
index 1a7a6301d0b6b4d42112e62b8c520813a3c4530b..8975591d080acb0efc55894e2f40ec830df9d1fd 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -367,6 +367,21 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        if (f->file_map)
                memset(f->file_map, 0, f->num_maps * sizeof(int));
 
+#ifdef FIO_OS_DIRECTIO
+       /*
+        * Some OS's have a distinct call to mark the file non-buffered,
+        * instead of using O_DIRECT (Solaris)
+        */
+       if (td->o.odirect) {
+               int ret = fio_set_odirect(f->fd);
+
+               if (ret) {
+                       td_verror(td, ret, "fio_set_odirect");
+                       goto err;
+               }
+       }
+#endif
+
 done:
        log_file(td, f, FIO_LOG_OPEN_FILE);
        return 0;

diff --git a/os/os-solaris.h b/os/os-solaris.h
index ac22bff154d4ecc9ade86d57ba6eb8dd2680d7ab..866e0c0e17b7dd5eefa741da991ca619dae69303 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -1,6 +1,9 @@
 #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
@@ -51,4 +54,14 @@ static inline long os_random_long(os_random_state_t *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