From 207cb0f05e689a50ffb960830f52169a1342aba7 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 2 Jun 2008 12:28:02 +0200 Subject: [PATCH] posixaio: not all platforms have aio_fsync() FreeBSD is (again) the odd man out... Signed-off-by: Jens Axboe --- engines/posixaio.c | 17 ++++++++++++++++- os/os-linux.h | 1 + os/os-solaris.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/engines/posixaio.c b/engines/posixaio.c index aef8928e..db11edb0 100644 --- 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 4c145a60..a07db06b 100644 --- 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 ae905169..038634d1 100644 --- 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) -- 2.25.1