posixaio: not all platforms have aio_fsync()

FreeBSD is (again) the odd man out...

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

diff --git a/engines/posixaio.c b/engines/posixaio.c
index aef8928ea62ca9b7aae62614dc94a41ef5c865b1..db11edb04fb7b9bbfa965f05365480a462743a31 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -16,6 +16,7 @@
 
 struct posixaio_data {
        struct io_u **aio_events;
+       unsigned int queued;
 };
 
 static int fill_timespec(struct timespec *ts)
@@ -112,6 +113,7 @@ restart:
                }
 
                io_u->seen = 1;
+               pd->queued--;
                pd->aio_events[r++] = io_u;
 
                if (err == ECANCELED)
@@ -156,6 +158,7 @@ static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
 static int fio_posixaio_queue(struct thread_data fio_unused *td,
                              struct io_u *io_u)
 {
+       struct posixaio_data *pd = td->io_ops->data;
        struct aiocb *aiocb = &io_u->aiocb;
        int ret;
 
@@ -165,15 +168,27 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
                ret = aio_read(aiocb);
        else if (io_u->ddir == DDIR_WRITE)
                ret = aio_write(aiocb);
-       else
+       else {
+#ifdef FIO_HAVE_POSIXAIO_FSYNC
                ret = aio_fsync(O_SYNC, aiocb);
+#else
+               if (pd->queued)
+                       return FIO_Q_BUSY;
+
+               if (fsync(io_u->file->fd) < 0)
+                       io_u->error = errno;
 
+               return FIO_Q_COMPLETED;
+#endif
+       }
+               
        if (ret) {
                io_u->error = errno;
                td_verror(td, io_u->error, "xfer");
                return FIO_Q_COMPLETED;
        }
 
+       pd->queued++;
        return FIO_Q_QUEUED;
 }
 

diff --git a/os/os-linux.h b/os/os-linux.h
index 4c145a60e0ced61d13e6c04a5f8083f1947b8383..a07db06b2a04c898af2d8320add4a56a8405e5df 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -27,6 +27,7 @@
 #define FIO_HAVE_BLKTRACE
 #define FIO_HAVE_STRSEP
 #define FIO_HAVE_FALLOCATE
+#define FIO_HAVE_POSIXAIO_FSYNC
 
 #define OS_MAP_ANON            (MAP_ANONYMOUS)
 

diff --git a/os/os-solaris.h b/os/os-solaris.h
index ae905169cc720a33b90c4f2a47abfd8a045f59dc..038634d1ce7fad0883d20a197811ab55be2bcebd 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -10,6 +10,7 @@
 #undef FIO_HAVE_SGIO
 #undef FIO_HAVE_ODIRECT
 #define FIO_HAVE_FALLOCATE
+#define FIO_HAVE_POSIXAIO_FSYNC
 
 #define OS_MAP_ANON            (MAP_ANON)