[PATCH] Link in known io engines

[fio.git] / engines / fio-engine-posixaio.c

diff --git a/engines/fio-engine-posixaio.c b/engines/fio-engine-posixaio.c
index 871db77c03152f51dbb42fc058a4b60b11b099cb..ef4d78ebe8a58c03465eb33cdc58aa7f90b52d7c 100644 (file)
--- a/engines/fio-engine-posixaio.c
+++ b/engines/fio-engine-posixaio.c
@@ -7,8 +7,11 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
-#include "fio.h"
-#include "os.h"
+
+#include "../fio.h"
+#include "../os.h"
+
+#ifdef FIO_HAVE_POSIXAIO
 
 struct posixaio_data {
        struct io_u **aio_events;
@@ -45,14 +48,11 @@ static unsigned long long ts_utime_since_now(struct timespec *t)
        return sec + nsec;
 }
 
-static int fio_posixaio_sync(struct thread_data *td)
+static int fio_posixaio_cancel(struct thread_data fio_unused *td,
+                              struct io_u *io_u)
 {
-       return fsync(td->fd);
-}
-
-static int fio_posixaio_cancel(struct thread_data *td, struct io_u *io_u)
-{
-       int r = aio_cancel(td->fd, &io_u->aiocb);
+       struct fio_file *f = io_u->file;
+       int r = aio_cancel(f->fd, &io_u->aiocb);
 
        if (r == 1 || r == AIO_CANCELED)
                return 0;
@@ -60,11 +60,13 @@ static int fio_posixaio_cancel(struct thread_data *td, struct io_u *io_u)
        return 1;
 }
 
-static int fio_posixaio_prep(struct thread_data *td, struct io_u *io_u)
+static int fio_posixaio_prep(struct thread_data fio_unused *td,
+                            struct io_u *io_u)
 {
        struct aiocb *aiocb = &io_u->aiocb;
+       struct fio_file *f = io_u->file;
 
-       aiocb->aio_fildes = td->fd;
+       aiocb->aio_fildes = f->fd;
        aiocb->aio_buf = io_u->buf;
        aiocb->aio_nbytes = io_u->buflen;
        aiocb->aio_offset = io_u->offset;
@@ -144,8 +146,10 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
 
        if (io_u->ddir == DDIR_READ)
                ret = aio_read(aiocb);
-       else
+       else if (io_u->ddir == DDIR_WRITE)
                ret = aio_write(aiocb);
+       else
+               ret = aio_fsync(O_SYNC, aiocb);
 
        if (ret)
                io_u->error = errno;
@@ -168,13 +172,15 @@ static int fio_posixaio_init(struct thread_data *td)
 {
        struct posixaio_data *pd = malloc(sizeof(*pd));
 
+       memset(pd, 0, sizeof(*pd));
        pd->aio_events = malloc(td->iodepth * sizeof(struct io_u *));
+       memset(pd->aio_events, 0, td->iodepth * sizeof(struct io_u *));
 
        td->io_ops->data = pd;
        return 0;
 }
 
-struct ioengine_ops ioengine = {
+static struct ioengine_ops ioengine = {
        .name           = "posixaio",
        .version        = FIO_IOOPS_VERSION,
        .init           = fio_posixaio_init,
@@ -184,5 +190,35 @@ struct ioengine_ops ioengine = {
        .getevents      = fio_posixaio_getevents,
        .event          = fio_posixaio_event,
        .cleanup        = fio_posixaio_cleanup,
-       .sync           = fio_posixaio_sync,
 };
+
+#else /* FIO_HAVE_POSIXAIO */
+
+/*
+ * 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_posixaio_init(struct thread_data fio_unused *td)
+{
+       fprintf(stderr, "fio: posixaio not available\n");
+       return 1;
+}
+
+static struct ioengine_ops ioengine = {
+       .name           = "posixaio",
+       .version        = FIO_IOOPS_VERSION,
+       .init           = fio_posixaio_init,
+};
+
+#endif
+
+static void fio_init fio_posixaio_register(void)
+{
+       register_ioengine(&ioengine);
+}
+
+static void fio_exit fio_posixaio_unregister(void)
+{
+       unregister_ioengine(&ioengine);
+}