posixaio: Missing memset()

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 10340571af57fa79f2621027f937bcb424d6b554..ddc75d1cfe54802c8c0ac09349930ed852e5a52a 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>
@@ -9,7 +11,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_POSIXAIO
 
@@ -75,18 +76,24 @@ 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 aiocb *suspend_list[SUSPEND_ENTRIES];
        struct list_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);
@@ -96,19 +103,26 @@ restart:
                        continue;
 
                err = aio_error(&io_u->aiocb);
-               switch (err) {
-                       default:
-                               io_u->error = err;
-                       case ECANCELED:
-                               io_u->resid = io_u->xfer_buflen;
-                       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->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;
        }
@@ -125,10 +139,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;
 }
 
@@ -145,6 +159,8 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
        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)
@@ -177,8 +193,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;
@@ -194,6 +210,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 */