engines/aio-ring: initialization error handling

[fio.git] / engines / aioring.c

diff --git a/engines/aioring.c b/engines/aioring.c
index ce9a2aac6ce2b865b91ad0565453d55a4cca7504..59551f9cbfc557f4c20a4aa4a999989cfafb9d46 100644 (file)
--- a/engines/aioring.c
+++ b/engines/aioring.c
@@ -197,26 +197,20 @@ static int fio_aioring_prep(struct thread_data *td, struct io_u *io_u)
 
        iocb = &ld->iocbs[io_u->index];
 
-       if (io_u->ddir == DDIR_READ) {
-               if (o->fixedbufs) {
-                       iocb->aio_fildes = f->fd;
+       if (io_u->ddir == DDIR_READ || io_u->ddir == DDIR_WRITE) {
+               if (io_u->ddir == DDIR_READ)
                        iocb->aio_lio_opcode = IO_CMD_PREAD;
-                       iocb->u.c.offset = io_u->offset;
-               } else {
-                       io_prep_pread(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-                       if (o->hipri)
-                               iocb->u.c.flags |= IOCB_FLAG_HIPRI;
-               }
-       } else if (io_u->ddir == DDIR_WRITE) {
-               if (o->fixedbufs) {
-                       iocb->aio_fildes = f->fd;
+               else
                        iocb->aio_lio_opcode = IO_CMD_PWRITE;
-                       iocb->u.c.offset = io_u->offset;
-               } else {
-                       io_prep_pwrite(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-                       if (o->hipri)
-                               iocb->u.c.flags |= IOCB_FLAG_HIPRI;
-               }
+               iocb->aio_reqprio = 0;
+               iocb->aio_fildes = f->fd;
+               iocb->u.c.buf = io_u->xfer_buf;
+               iocb->u.c.nbytes = io_u->xfer_buflen;
+               iocb->u.c.offset = io_u->offset;
+               if (o->hipri)
+                       iocb->u.c.flags |= IOCB_FLAG_HIPRI;
+               else
+                       iocb->u.c.flags = 0;
        } else if (ddir_sync(io_u->ddir))
                io_prep_fsync(iocb, f->fd);
 
@@ -480,7 +474,8 @@ static int fio_aioring_queue_init(struct thread_data *td)
                flags |= IOCTX_FLAG_SQTHREAD;
                if (o->sqthread_poll)
                        flags |= IOCTX_FLAG_SQPOLL;
-       } else if (o->sqwq)
+       }
+       if (o->sqwq)
                flags |= IOCTX_FLAG_SQWQ;
 
        if (o->fixedbufs) {
@@ -520,26 +515,22 @@ static int fio_aioring_post_init(struct thread_data *td)
        }
 
        err = fio_aioring_queue_init(td);
+
+       /* Adjust depth back again */
+       td->o.iodepth--;
+
        if (err) {
-               td_verror(td, -err, "io_queue_init");
+               td_verror(td, errno, "io_queue_init");
                return 1;
        }
 
-       /* Adjust depth back again */
-       td->o.iodepth--;
        return 0;
 }
 
 static int fio_aioring_init(struct thread_data *td)
 {
-       struct aioring_options *o = td->eo;
        struct aioring_data *ld;
 
-       if (o->sqthread_set && o->sqwq) {
-               log_err("fio: aioring sqthread and sqwq are mutually exclusive\n");
-               return 1;
-       }
-
        /* ring needs an extra entry, add one to achieve QD set */
        td->o.iodepth++;