options: split out option grouping code

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 12f3b366d71be5c521a67d238878f0f3a947ad2d..9d562bb272e6eef5297bb2a6252b1392915f7e2d 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -12,6 +12,8 @@
 #include <libaio.h>
 
 #include "../fio.h"
+#include "../lib/pow2.h"
+#include "../optgroup.h"
 
 static int fio_libaio_commit(struct thread_data *td);
 
@@ -37,7 +39,7 @@ struct libaio_data {
 };
 
 struct libaio_options {
-       struct thread_data *td;
+       void *pad;
        unsigned int userspace_reap;
 };
 
@@ -145,7 +147,7 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
 {
        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;
 
@@ -281,7 +283,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;
@@ -316,7 +318,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);