Merge branch 'master' into gfio

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index ad7903cf5f1d36bdc9dfd4585e864c172ba87726..be54dca9d0ba10c4b109f29e9387884e2e6b70d0 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -9,13 +9,10 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
+#include <libaio.h>
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_LIBAIO
-
-#define ev_to_iou(ev)  (struct io_u *) ((unsigned long) (ev)->obj)
-
 struct libaio_data {
        io_context_t aio_ctx;
        struct io_event *aio_events;
@@ -32,9 +29,12 @@ struct libaio_options {
 static struct fio_option options[] = {
        {
                .name   = "userspace_reap",
+               .lname  = "Libaio userspace reaping",
                .type   = FIO_OPT_STR_SET,
                .off1   = offsetof(struct libaio_options, userspace_reap),
                .help   = "Use alternative user-space reap implementation",
+               .category = FIO_OPT_C_ENGINE,
+               .category = FIO_OPT_G_LIBAIO,
        },
        {
                .name   = NULL,
@@ -62,7 +62,7 @@ static struct io_u *fio_libaio_event(struct thread_data *td, int event)
        struct io_u *io_u;
 
        ev = ld->aio_events + event;
-       io_u = ev_to_iou(ev);
+       io_u = container_of(ev->obj, struct io_u, iocb);
 
        if (ev->res != io_u->xfer_buflen) {
                if (ev->res > io_u->xfer_buflen)
@@ -266,7 +266,7 @@ static int fio_libaio_init(struct thread_data *td)
         * and we need the right depth.
         */
        if (!o->userspace_reap)
-               err = io_queue_init(0, &ld->aio_ctx);
+               err = io_queue_init(INT_MAX, &ld->aio_ctx);
        if (o->userspace_reap || err == -EINVAL)
                err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
        if (err) {
@@ -306,27 +306,6 @@ static struct ioengine_ops ioengine = {
        .option_struct_size     = sizeof(struct libaio_options),
 };
 
-#else /* FIO_HAVE_LIBAIO */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_libaio_init(struct thread_data fio_unused *td)
-{
-       log_err("fio: libaio not available\n");
-       return 1;
-}
-
-static struct ioengine_ops ioengine = {
-       .name           = "libaio",
-       .version        = FIO_IOOPS_VERSION,
-       .init           = fio_libaio_init,
-};
-
-#endif
-
 static void fio_init fio_libaio_register(void)
 {
        register_ioengine(&ioengine);