X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Ffio-engine-posixaio.c;h=ef4d78ebe8a58c03465eb33cdc58aa7f90b52d7c;hp=260551a4ee8b506f9c1fa84cc30711bddf168255;hb=5f350952eff89948bfbf1eb6ac4d3d08a9109581;hpb=7a16dd027f83d7ff8ff0e72bb6bb12fae046fcbf;ds=sidebyside

diff --git a/engines/fio-engine-posixaio.c b/engines/fio-engine-posixaio.c
index 260551a4..ef4d78eb 100644
--- 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,12 +48,6 @@ static unsigned long long ts_utime_since_now(struct timespec *t)
 	return sec + nsec;
 }
 
-static int fio_posixaio_sync(struct thread_data fio_unused *td,
-			     struct fio_file *f)
-{
-	return fsync(f->fd);
-}
-
 static int fio_posixaio_cancel(struct thread_data fio_unused *td,
 			       struct io_u *io_u)
 {
@@ -149,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;
@@ -173,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,
@@ -189,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);
+}