Issue time fixup for guasi/libaio

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 7c44927a3b8b5a3ac39b37b4eb43ed6760582d87..18dcf9ddfad59d753a2cf4b71061065dc6baf6fc 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -11,7 +11,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_LIBAIO
 
@@ -61,8 +60,8 @@ static struct io_u *fio_libaio_event(struct thread_data *td, int event)
        return io_u;
 }
 
-static int fio_libaio_getevents(struct thread_data *td, int min, int max,
-                               struct timespec *t)
+static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
+                               unsigned int max, struct timespec *t)
 {
        struct libaio_data *ld = td->io_ops->data;
        long r;
@@ -87,6 +86,8 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct libaio_data *ld = td->io_ops->data;
 
+       fio_ro_check(td, io_u);
+
        if (ld->iocbs_nr == (int) td->o.iodepth)
                return FIO_Q_BUSY;
 
@@ -117,6 +118,9 @@ static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
        struct timeval now;
        unsigned int i;
 
+       if (!fio_fill_issue_time(td))
+               return;
+
        fio_gettime(&now, NULL);
 
        for (i = 0; i < nr; i++) {
@@ -132,36 +136,29 @@ static int fio_libaio_commit(struct thread_data *td)
        struct libaio_data *ld = td->io_ops->data;
        struct iocb **iocbs;
        struct io_u **io_us;
-       int ret, iocbs_nr;
+       int ret;
 
        if (!ld->iocbs_nr)
                return 0;
 
-       iocbs_nr = ld->iocbs_nr;
        io_us = ld->io_us;
        iocbs = ld->iocbs;
        do {
-               ret = io_submit(ld->aio_ctx, iocbs_nr, iocbs);
-               if (ret == iocbs_nr) {
-                       fio_libaio_queued(td, io_us, ret);
-                       ret = 0;
-                       break;
-               } else if (ret > 0) {
+               ret = io_submit(ld->aio_ctx, ld->iocbs_nr, iocbs);
+               if (ret > 0) {
                        fio_libaio_queued(td, io_us, ret);
+                       io_u_mark_submit(td, ret);
+                       ld->iocbs_nr -= ret;
                        io_us += ret;
                        iocbs += ret;
-                       iocbs_nr -= ret;
-                       continue;
-               } else if (ret == -EAGAIN || !ret)
-                       usleep(100);
-               else if (ret == -EINTR)
+                       ret = 0;
+               } else if (!ret || ret == -EAGAIN || ret == -EINTR) {
+                       if (!ret)
+                               io_u_mark_submit(td, ret);
                        continue;
-               else
+               } else
                        break;
-       } while (1);
-
-       if (!ret)
-               ld->iocbs_nr = 0;
+       } while (ld->iocbs_nr);
 
        return ret;
 }
@@ -183,20 +180,26 @@ static void fio_libaio_cleanup(struct thread_data *td)
                free(ld->iocbs);
                free(ld->io_us);
                free(ld);
-               td->io_ops->data = NULL;
        }
 }
 
 static int fio_libaio_init(struct thread_data *td)
 {
        struct libaio_data *ld = malloc(sizeof(*ld));
+       static int warn_print;
        int err;
 
+       if (td->o.iodepth > 1 && !td->o.odirect && !warn_print) {
+               log_info("fio: libaio engine is only async for non-buffered IO\n");
+               warn_print = 1;
+       }
+
        memset(ld, 0, sizeof(*ld));
 
        err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
        if (err) {
                td_verror(td, -err, "io_queue_init");
+               log_err("fio: check /proc/sys/fs/aio-max-nr\n");
                free(ld);
                return 1;
        }