posixaio engine: better handling of partial completions

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 2fc56cd690772e05c1881f73eff2449f14cab981..88dc0e90a654f2d49f372194a3caf6fe575684de 100644 (file)
--- 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>
@@ -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;
@@ -153,10 +158,11 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
 
        if (ret) {
                io_u->error = errno;
-               td_verror(td, io_u->error);
+               td_verror(td, io_u->error, "xfer");
+               return FIO_Q_COMPLETED;
        }
-               
-       return io_u->error;
+
+       return FIO_Q_QUEUED;
 }
 
 static void fio_posixaio_cleanup(struct thread_data *td)
@@ -192,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 */