X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fposixaio.c;h=4aa7420c020dffbfff36a77d74c3d15b7fb6dc3b;hb=4d06a3384c0bf34d217fa942d85dc70dfc282da9;hp=ef4d78ebe8a58c03465eb33cdc58aa7f90b52d7c;hpb=f8fe35e8c9e88dd681ea151251d75f6116a958b4;p=fio.git

diff --git a/engines/posixaio.c b/engines/posixaio.c
index ef4d78eb..4aa7420c 100644
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -1,5 +1,7 @@
 /*
- * posix aio io engine
+ * posixaio engine
+ *
+ * IO engine that uses the posix defined aio interface.
  *
  */
 #include <stdio.h>
@@ -67,8 +69,8 @@ static int fio_posixaio_prep(struct thread_data fio_unused *td,
 	struct fio_file *f = io_u->file;
 
 	aiocb->aio_fildes = f->fd;
-	aiocb->aio_buf = io_u->buf;
-	aiocb->aio_nbytes = io_u->buflen;
+	aiocb->aio_buf = io_u->xfer_buf;
+	aiocb->aio_nbytes = io_u->xfer_buflen;
 	aiocb->aio_offset = io_u->offset;
 
 	io_u->seen = 0;
@@ -96,17 +98,20 @@ restart:
 			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)
+			continue;
+
+		io_u->seen = 1;
+		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;
@@ -151,10 +156,13 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
 	else
 		ret = aio_fsync(O_SYNC, aiocb);
 
-	if (ret)
+	if (ret) {
 		io_u->error = errno;
-		
-	return io_u->error;
+		td_verror(td, io_u->error, "xfer");
+		return FIO_Q_COMPLETED;
+	}
+
+	return FIO_Q_QUEUED;
 }
 
 static void fio_posixaio_cleanup(struct thread_data *td)
@@ -173,8 +181,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 +198,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 */