Add sub-option support (sort-of) and convert libaio_userspace_reap

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 44a7613990593f48903a051370877dc19a6f8503..ad34d065a3c3bb5cea63e97963a6a3609cd44707 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -58,26 +58,72 @@ static struct io_u *fio_libaio_event(struct thread_data *td, int event)
        return io_u;
 }
 
+struct aio_ring {
+       unsigned id;             /** kernel internal index number */
+       unsigned nr;             /** number of io_events */
+       unsigned head;
+       unsigned tail;
+
+       unsigned magic;
+       unsigned compat_features;
+       unsigned incompat_features;
+       unsigned header_length; /** size of aio_ring */
+
+       struct io_event events[0];
+};
+
+#define AIO_RING_MAGIC 0xa10a10a1
+
+static int user_io_getevents(io_context_t aio_ctx, unsigned int max,
+                            struct io_event *events)
+{
+       long i = 0;
+       unsigned head;
+       struct aio_ring *ring = (struct aio_ring*) aio_ctx;
+
+       while (i < max) {
+               head = ring->head;
+
+               if (head == ring->tail) {
+                       /* There are no more completions */
+                       break;
+               } else {
+                       /* There is another completion to reap */
+                       events[i] = ring->events[head];
+                       read_barrier();
+                       ring->head = (head + 1) % ring->nr;
+                       i++;
+               }
+       }
+
+       return i;
+}
+
 static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
                                unsigned int max, struct timespec *t)
 {
        struct libaio_data *ld = td->io_ops->data;
-       int r;
+       unsigned actual_min = td->o.iodepth_batch_complete == 0 ? 0 : min;
+       int r, events = 0;
 
        do {
-               r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
-               if (r >= (int) min)
-                       break;
-               else if (r == -EAGAIN) {
+               if (td->o.userspace_libaio_reap == 1
+                   && actual_min == 0
+                   && ((struct aio_ring *)(ld->aio_ctx))->magic
+                               == AIO_RING_MAGIC) {
+                       r = user_io_getevents(ld->aio_ctx, max,
+                               ld->aio_events + events);
+               } else {
+                       r = io_getevents(ld->aio_ctx, actual_min,
+                               max, ld->aio_events + events, t);
+               }
+               if (r >= 0)
+                       events += r;
+               else if (r == -EAGAIN)
                        usleep(100);
-                       continue;
-               } else if (r == -EINTR)
-                       continue;
-               else if (r != 0)
-                       break;
-       } while (1);
+       } while (events < min);
 
-       return r;
+       return r < 0 ? r : events;
 }
 
 static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
@@ -240,7 +286,7 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_libaio_init(struct thread_data fio_unused *td)
 {
-       fprintf(stderr, "fio: libaio not available\n");
+       log_err("fio: libaio not available\n");
        return 1;
 }