OSX: Fixup warnings and clock_gettime() bug

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 70282f2975f660185fa832dcbf868850e011f0a1..a943e5bbf6eaad2c953d21f5c9abd431690fdabf 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -12,8 +12,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_POSIXAIO
-
 struct posixaio_data {
        struct io_u **aio_events;
        unsigned int queued;
@@ -21,13 +19,25 @@ struct posixaio_data {
 
 static int fill_timespec(struct timespec *ts)
 {
-#ifdef _POSIX_TIMERS
-       if (!clock_gettime(CLOCK_MONOTONIC, ts))
+#ifdef CONFIG_CLOCK_GETTIME
+#ifdef CONFIG_CLOCK_MONOTONIC
+       clockid_t clk = CLOCK_MONOTONIC;
+#else
+       clockid_t clk = CLOCK_REALTIME;
+#endif
+       if (!clock_gettime(clk, ts))
                return 0;
 
        perror("clock_gettime");
-#endif
        return 1;
+#else
+       struct timeval tv;
+
+       gettimeofday(&tv, NULL);
+       ts->tv_sec = tv.tv_sec;
+       ts->tv_nsec = tv.tv_usec * 1000;
+       return 0;
+#endif
 }
 
 static unsigned long long ts_utime_since_now(struct timespec *t)
@@ -56,7 +66,7 @@ static int fio_posixaio_cancel(struct thread_data fio_unused *td,
        struct fio_file *f = io_u->file;
        int r = aio_cancel(f->fd, &io_u->aiocb);
 
-       if (r == 1 || r == AIO_CANCELED)
+       if (r == AIO_ALLDONE || r == AIO_CANCELED)
                return 0;
 
        return 1;
@@ -65,13 +75,14 @@ static int fio_posixaio_cancel(struct thread_data fio_unused *td,
 static int fio_posixaio_prep(struct thread_data fio_unused *td,
                             struct io_u *io_u)
 {
-       struct aiocb *aiocb = &io_u->aiocb;
+       os_aiocb_t *aiocb = &io_u->aiocb;
        struct fio_file *f = io_u->file;
 
        aiocb->aio_fildes = f->fd;
        aiocb->aio_buf = io_u->xfer_buf;
        aiocb->aio_nbytes = io_u->xfer_buflen;
        aiocb->aio_offset = io_u->offset;
+       aiocb->aio_sigevent.sigev_notify = SIGEV_NONE;
 
        io_u->seen = 0;
        return 0;
@@ -83,7 +94,7 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
                                  unsigned int max, struct timespec *t)
 {
        struct posixaio_data *pd = td->io_ops->data;
-       struct aiocb *suspend_list[SUSPEND_ENTRIES];
+       os_aiocb_t *suspend_list[SUSPEND_ENTRIES];
        struct flist_head *entry;
        struct timespec start;
        int have_timeout = 0;
@@ -92,6 +103,8 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
 
        if (t && !fill_timespec(&start))
                have_timeout = 1;
+       else
+               memset(&start, 0, sizeof(start));
 
        r = 0;
        memset(suspend_list, 0, sizeof(*suspend_list));
@@ -124,9 +137,6 @@ restart:
                        io_u->resid = io_u->xfer_buflen - retval;
                } else
                        io_u->error = err;
-
-               if (r >= max)
-                       break;
        }
 
        if (r >= min)
@@ -143,7 +153,7 @@ restart:
        /*
         * must have some in-flight, wait for at least one
         */
-       aio_suspend((const struct aiocb * const *)suspend_list,
+       aio_suspend((const os_aiocb_t * const *)suspend_list,
                                                        suspend_entries, t);
        goto restart;
 }
@@ -155,11 +165,11 @@ static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
        return pd->aio_events[event];
 }
 
-static int fio_posixaio_queue(struct thread_data fio_unused *td,
+static int fio_posixaio_queue(struct thread_data *td,
                              struct io_u *io_u)
 {
        struct posixaio_data *pd = td->io_ops->data;
-       struct aiocb *aiocb = &io_u->aiocb;
+       os_aiocb_t *aiocb = &io_u->aiocb;
        int ret;
 
        fio_ro_check(td, io_u);
@@ -168,8 +178,14 @@ 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 {
-#ifdef FIO_HAVE_POSIXAIO_FSYNC
+       else if (io_u->ddir == DDIR_TRIM) {
+               if (pd->queued)
+                       return FIO_Q_BUSY;
+
+               do_io_u_trim(td, io_u);
+               return FIO_Q_COMPLETED;
+       } else {
+#ifdef CONFIG_POSIXAIO_FSYNC
                ret = aio_fsync(O_SYNC, aiocb);
 #else
                if (pd->queued)
@@ -181,6 +197,15 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
        }
                
        if (ret) {
+               /*
+                * At least OSX has a very low limit on the number of pending
+                * IOs, so if it returns EAGAIN, we are out of resources
+                * to queue more. Just return FIO_Q_BUSY to naturally
+                * drop off at this depth.
+                */
+               if (errno == EAGAIN)
+                       return FIO_Q_BUSY;
+
                io_u->error = errno;
                td_verror(td, io_u->error, "xfer");
                return FIO_Q_COMPLETED;
@@ -227,27 +252,6 @@ static struct ioengine_ops ioengine = {
        .get_file_size  = generic_get_file_size,
 };
 
-#else /* FIO_HAVE_POSIXAIO */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_posixaio_init(struct thread_data fio_unused *td)
-{
-       fprintf(stderr, "fio: posixaio not available\n");
-       return 1;
-}
-
-static struct ioengine_ops ioengine = {
-       .name           = "posixaio",
-       .version        = FIO_IOOPS_VERSION,
-       .init           = fio_posixaio_init,
-};
-
-#endif
-
 static void fio_init fio_posixaio_register(void)
 {
        register_ioengine(&ioengine);