X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fposixaio.c;h=db11edb04fb7b9bbfa965f05365480a462743a31;hp=71601fdd31c8df937cc08498c04d308875135d5e;hb=12d9d841526ad75a67bb43a90edeefd05f85f11e;hpb=cec6b55da1c282b5b91ad346c7804171fccf151e;ds=sidebyside

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 71601fdd..db11edb0 100644
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -1,20 +1,22 @@
 /*
- * posix aio io engine
+ * posixaio engine
+ *
+ * IO engine that uses the posix defined aio interface.
  *
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
+#include <fcntl.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_POSIXAIO
 
 struct posixaio_data {
 	struct io_u **aio_events;
+	unsigned int queued;
 };
 
 static int fill_timespec(struct timespec *ts)
@@ -75,39 +77,54 @@ static int fio_posixaio_prep(struct thread_data fio_unused *td,
 	return 0;
 }
 
-static int fio_posixaio_getevents(struct thread_data *td, int min, int max,
-				  struct timespec *t)
+#define SUSPEND_ENTRIES	8
+
+static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
+				  unsigned int max, struct timespec *t)
 {
 	struct posixaio_data *pd = td->io_ops->data;
-	struct list_head *entry;
+	struct aiocb *suspend_list[SUSPEND_ENTRIES];
+	struct flist_head *entry;
 	struct timespec start;
-	int r, have_timeout = 0;
+	int have_timeout = 0;
+	int suspend_entries = 0;
+	unsigned int r;
 
 	if (t && !fill_timespec(&start))
 		have_timeout = 1;
 
 	r = 0;
+	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)
 			continue;
 
 		err = aio_error(&io_u->aiocb);
-		switch (err) {
-			default:
-				io_u->error = err;
-			case ECANCELED:
-			case 0:
-				pd->aio_events[r++] = io_u;
-				io_u->seen = 1;
-				break;
-			case EINPROGRESS:
-				break;
+		if (err == EINPROGRESS) {
+			if (suspend_entries < SUSPEND_ENTRIES) {
+				suspend_list[suspend_entries] = &io_u->aiocb;
+				suspend_entries++;
+			}
+			continue;
 		}
 
+		io_u->seen = 1;
+		pd->queued--;
+		pd->aio_events[r++] = io_u;
+
+		if (err == ECANCELED)
+			io_u->resid = io_u->xfer_buflen;
+		else if (!err) {
+			ssize_t retval = aio_return(&io_u->aiocb);
+
+			io_u->resid = io_u->xfer_buflen - retval;
+		} else
+			io_u->error = err;
+
 		if (r >= max)
 			break;
 	}
@@ -124,10 +141,10 @@ restart:
 	}
 
 	/*
-	 * hrmpf, we need to wait for more. we should use aio_suspend, for
-	 * now just sleep a little and recheck status of busy-and-not-seen
+	 * must have some in-flight, wait for at least one
 	 */
-	usleep(1000);
+	aio_suspend((const struct aiocb * const *)suspend_list,
+							suspend_entries, t);
 	goto restart;
 }
 
@@ -141,20 +158,38 @@ 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;
 
+	fio_ro_check(td, io_u);
+
 	if (io_u->ddir == DDIR_READ)
 		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 (ret)
-		io_u->error = errno;
+		if (fsync(io_u->file->fd) < 0)
+			io_u->error = errno;
+
+		return FIO_Q_COMPLETED;
+#endif
+	}
 		
-	return io_u->error;
+	if (ret) {
+		io_u->error = errno;
+		td_verror(td, io_u->error, "xfer");
+		return FIO_Q_COMPLETED;
+	}
+
+	pd->queued++;
+	return FIO_Q_QUEUED;
 }
 
 static void fio_posixaio_cleanup(struct thread_data *td)
@@ -164,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;
 	}
 }
 
@@ -173,8 +207,8 @@ 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 *));
+	pd->aio_events = malloc(td->o.iodepth * sizeof(struct io_u *));
+	memset(pd->aio_events, 0, td->o.iodepth * sizeof(struct io_u *));
 
 	td->io_ops->data = pd;
 	return 0;
@@ -190,6 +224,8 @@ static struct ioengine_ops ioengine = {
 	.getevents	= fio_posixaio_getevents,
 	.event		= fio_posixaio_event,
 	.cleanup	= fio_posixaio_cleanup,
+	.open_file	= generic_open_file,
+	.close_file	= generic_close_file,
 };
 
 #else /* FIO_HAVE_POSIXAIO */