Full readonly check

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 7d9aaaf18314bffe3ea30fe211918d69e89b8095..9ff05c4914151387dae188d4c8798c7c3d0985c0 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -11,7 +11,6 @@
 #include <assert.h>
 
 #include "../fio.h"
 #include <assert.h>
 
 #include "../fio.h"

-#include "../os.h"

 
 #ifdef FIO_HAVE_POSIXAIO
 
 
 #ifdef FIO_HAVE_POSIXAIO
 


@@ -98,18 +97,20 @@ restart:
                        continue;
 
                err = aio_error(&io_u->aiocb);
                        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)
+                       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;
 
                if (r >= max)
                        break;


@@ -147,6 +148,8 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td,
        struct aiocb *aiocb = &io_u->aiocb;
        int ret;
 
        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)
        if (io_u->ddir == DDIR_READ)
                ret = aio_read(aiocb);
        else if (io_u->ddir == DDIR_WRITE)


@@ -179,8 +182,8 @@ static int fio_posixaio_init(struct thread_data *td)
        struct posixaio_data *pd = malloc(sizeof(*pd));
 
        memset(pd, 0, sizeof(*pd));
        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;
 
        td->io_ops->data = pd;
        return 0;