Merge branch 'io-threads'

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index f7e2f8967c8900a1d5c6839dda1d746df5986b60..8ba21f8959b318939786aaa21b96e21f7485d8c5 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -37,7 +37,7 @@ struct libaio_data {
 };
 
 struct libaio_options {
-       struct thread_data *td;
+       void *pad;
        unsigned int userspace_reap;
 };
 
@@ -316,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);