Merge branch 'io-threads'

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 6c5d73ed27dd1751ac98c1177fcdbf2bdf2fe487..8ba21f8959b318939786aaa21b96e21f7485d8c5 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -13,6 +13,8 @@
 
 #include "../fio.h"
 
+static int fio_libaio_commit(struct thread_data *td);
+
 struct libaio_data {
        io_context_t aio_ctx;
        struct io_event *aio_events;
@@ -35,7 +37,7 @@ struct libaio_data {
 };
 
 struct libaio_options {
-       struct thread_data *td;
+       void *pad;
        unsigned int userspace_reap;
 };
 
@@ -163,11 +165,12 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
                        r = io_getevents(ld->aio_ctx, actual_min,
                                max, ld->aio_events + events, lt);
                }
-               if (r >= 0)
+               if (r > 0)
                        events += r;
-               else if (r == -EAGAIN)
+               else if ((min && r == 0) || r == -EAGAIN) {
+                       fio_libaio_commit(td);
                        usleep(100);
-               else
+               } else if (r != -EINTR)
                        break;
        } while (events < min);
 
@@ -278,7 +281,7 @@ static int fio_libaio_commit(struct thread_data *td)
                        }
                        if (!wait_start) {
                                fio_gettime(&tv, NULL);
-                               wait_start = 0;
+                               wait_start = 1;
                        } else if (mtime_since_now(&tv) > 30000) {
                                log_err("fio: aio appears to be stalled, giving up\n");
                                break;
@@ -313,7 +316,14 @@ static void fio_libaio_cleanup(struct thread_data *td)
        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);