X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fposixaio.c;h=3ffdcb6bccc8d062b1be302b27c3cb004bd57d11;hp=95141750a26466d8e8f4c6894e3716fa7bac3a4d;hb=a1c58075279454a91ec43366846b93e8dcf9753c;hpb=3c77037e67c4a4af29e12f760db2541bad6c5898

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 95141750..3ffdcb6b 100644
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
+#include <fcntl.h>
 
 #include "../fio.h"
 
@@ -16,6 +16,7 @@
 
 struct posixaio_data {
 	struct io_u **aio_events;
+	unsigned int queued;
 };
 
 static int fill_timespec(struct timespec *ts)
@@ -83,7 +84,7 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
 {
 	struct posixaio_data *pd = td->io_ops->data;
 	struct aiocb *suspend_list[SUSPEND_ENTRIES];
-	struct list_head *entry;
+	struct flist_head *entry;
 	struct timespec start;
 	int have_timeout = 0;
 	int suspend_entries = 0;
@@ -93,10 +94,10 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
 		have_timeout = 1;
 
 	r = 0;
-	suspend_list[0] = NULL;
+	memset(suspend_list, 0, sizeof(*suspend_list));
 restart:
-	list_for_each(entry, &td->io_u_busylist) {
-		struct io_u *io_u = list_entry(entry, struct io_u, list);
+	flist_for_each(entry, &td->io_u_busylist) {
+		struct io_u *io_u = flist_entry(entry, struct io_u, list);
 		int err;
 
 		if (io_u->seen)
@@ -112,6 +113,7 @@ restart:
 		}
 
 		io_u->seen = 1;
+		pd->queued--;
 		pd->aio_events[r++] = io_u;
 
 		if (err == ECANCELED)
@@ -156,6 +158,7 @@ static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
 static int fio_posixaio_queue(struct thread_data fio_unused *td,
 			      struct io_u *io_u)
 {
+	struct posixaio_data *pd = td->io_ops->data;
 	struct aiocb *aiocb = &io_u->aiocb;
 	int ret;
 
@@ -165,15 +168,27 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
 		ret = aio_read(aiocb);
 	else if (io_u->ddir == DDIR_WRITE)
 		ret = aio_write(aiocb);
-	else
+	else {
+#ifdef FIO_HAVE_POSIXAIO_FSYNC
 		ret = aio_fsync(O_SYNC, aiocb);
+#else
+		if (pd->queued)
+			return FIO_Q_BUSY;
+
+		if (fsync(io_u->file->fd) < 0)
+			io_u->error = errno;
 
+		return FIO_Q_COMPLETED;
+#endif
+	}
+		
 	if (ret) {
 		io_u->error = errno;
 		td_verror(td, io_u->error, "xfer");
 		return FIO_Q_COMPLETED;
 	}
 
+	pd->queued++;
 	return FIO_Q_QUEUED;
 }
 
@@ -184,7 +199,6 @@ static void fio_posixaio_cleanup(struct thread_data *td)
 	if (pd) {
 		free(pd->aio_events);
 		free(pd);
-		td->io_ops->data = NULL;
 	}
 }
 
@@ -212,6 +226,7 @@ static struct ioengine_ops ioengine = {
 	.cleanup	= fio_posixaio_cleanup,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 };
 
 #else /* FIO_HAVE_POSIXAIO */