engines/libaio: don't sleep for 0 reap return for 0 event check

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 12f3b366d71be5c521a67d238878f0f3a947ad2d..dae2a70b2c86ea8f8368d97bb680eaccf8d73862 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -4,14 +4,14 @@
  * IO engine using the Linux native aio interface.
  *
  */
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
 #include <libaio.h>
 
 #include "../fio.h"
+#include "../lib/pow2.h"
+#include "../optgroup.h"
 
 static int fio_libaio_commit(struct thread_data *td);
 
@@ -37,7 +37,7 @@ struct libaio_data {
 };
 
 struct libaio_options {
-       struct thread_data *td;
+       void *pad;
        unsigned int userspace_reap;
 };
 
@@ -81,7 +81,7 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 
 static struct io_u *fio_libaio_event(struct thread_data *td, int event)
 {
-       struct libaio_data *ld = td->io_ops->data;
+       struct libaio_data *ld = td->io_ops_data;
        struct io_event *ev;
        struct io_u *io_u;
 
@@ -143,9 +143,9 @@ static int user_io_getevents(io_context_t aio_ctx, unsigned int max,
 static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
                                unsigned int max, const struct timespec *t)
 {
-       struct libaio_data *ld = td->io_ops->data;
+       struct libaio_data *ld = td->io_ops_data;
        struct libaio_options *o = td->eo;
-       unsigned actual_min = td->o.iodepth_batch_complete == 0 ? 0 : min;
+       unsigned actual_min = td->o.iodepth_batch_complete_min == 0 ? 0 : min;
        struct timespec __lt, *lt = NULL;
        int r, events = 0;
 
@@ -169,7 +169,8 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
                        events += r;
                else if ((min && r == 0) || r == -EAGAIN) {
                        fio_libaio_commit(td);
-                       usleep(100);
+                       if (actual_min)
+                               usleep(10);
                } else if (r != -EINTR)
                        break;
        } while (events < min);
@@ -177,9 +178,10 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
        return r < 0 ? r : events;
 }
 
-static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_libaio_queue(struct thread_data *td,
+                                         struct io_u *io_u)
 {
-       struct libaio_data *ld = td->io_ops->data;
+       struct libaio_data *ld = td->io_ops_data;
 
        fio_ro_check(td, io_u);
 
@@ -218,7 +220,7 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
                              unsigned int nr)
 {
-       struct timeval now;
+       struct timespec now;
        unsigned int i;
 
        if (!fio_fill_issue_time(td))
@@ -236,10 +238,10 @@ static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
 
 static int fio_libaio_commit(struct thread_data *td)
 {
-       struct libaio_data *ld = td->io_ops->data;
+       struct libaio_data *ld = td->io_ops_data;
        struct iocb **iocbs;
        struct io_u **io_us;
-       struct timeval tv;
+       struct timespec ts;
        int ret, wait_start = 0;
 
        if (!ld->queued)
@@ -280,9 +282,9 @@ static int fio_libaio_commit(struct thread_data *td)
                                break;
                        }
                        if (!wait_start) {
-                               fio_gettime(&tv, NULL);
-                               wait_start = 0;
-                       } else if (mtime_since_now(&tv) > 30000) {
+                               fio_gettime(&ts, NULL);
+                               wait_start = 1;
+                       } else if (mtime_since_now(&ts) > 30000) {
                                log_err("fio: aio appears to be stalled, giving up\n");
                                break;
                        }
@@ -306,17 +308,24 @@ static int fio_libaio_commit(struct thread_data *td)
 
 static int fio_libaio_cancel(struct thread_data *td, struct io_u *io_u)
 {
-       struct libaio_data *ld = td->io_ops->data;
+       struct libaio_data *ld = td->io_ops_data;
 
        return io_cancel(ld->aio_ctx, &io_u->iocb, ld->aio_events);
 }
 
 static void fio_libaio_cleanup(struct thread_data *td)
 {
-       struct libaio_data *ld = td->io_ops->data;
+       struct libaio_data *ld = td->io_ops_data;
 
        if (ld) {
-               io_destroy(ld->aio_ctx);
+               /*
+                * Work-around to avoid huge RCU stalls at exit time. If we
+                * don't do this here, then it'll be torn down by exit_aio().
+                * But for that case we can parallellize the freeing, thus
+                * speeding it up a lot.
+                */
+               if (!(td->flags & TD_F_CHILD))
+                       io_destroy(ld->aio_ctx);
                free(ld->aio_events);
                free(ld->iocbs);
                free(ld->io_us);
@@ -354,7 +363,7 @@ static int fio_libaio_init(struct thread_data *td)
        ld->iocbs = calloc(ld->entries, sizeof(struct iocb *));
        ld->io_us = calloc(ld->entries, sizeof(struct io_u *));
 
-       td->io_ops->data = ld;
+       td->io_ops_data = ld;
        return 0;
 }