libaio: Add hint on libaio engine init failing

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 29eac20fe80412f55b7783fd8586dc880fac054b..7ef3ff8074d005be36a3ef5d90926dc1cc683a0e 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -133,36 +133,26 @@ 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);
+                       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)
                        continue;
                else
                        break;
-       } while (1);
-
-       if (!ret)
-               ld->iocbs_nr = 0;
+       } while (ld->iocbs_nr);
 
        return ret;
 }
@@ -204,6 +194,7 @@ static int fio_libaio_init(struct thread_data *td)
        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;
        }