Add more context to the error messages

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index da43f18ce1571b7c729ceb35fce02ec1aae00e12..bd702e30f132ab082a69add4b729ca9e6dd6d9b5 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -18,6 +18,9 @@
 struct libaio_data {
        io_context_t aio_ctx;
        struct io_event *aio_events;
+       struct iocb **iocbs;
+       struct io_u **io_us;
+       int iocbs_nr;
 };
 
 static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
@@ -25,9 +28,9 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
        struct fio_file *f = io_u->file;
 
        if (io_u->ddir == DDIR_READ)
-               io_prep_pread(&io_u->iocb, f->fd, io_u->buf, io_u->buflen, io_u->offset);
+               io_prep_pread(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
        else if (io_u->ddir == DDIR_WRITE)
-               io_prep_pwrite(&io_u->iocb, f->fd, io_u->buf, io_u->buflen, io_u->offset);
+               io_prep_pwrite(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
        else if (io_u->ddir == DDIR_SYNC)
                io_prep_fsync(&io_u->iocb, f->fd);
        else
@@ -62,23 +65,79 @@ static int fio_libaio_getevents(struct thread_data *td, int min, int max,
                        break;
        } while (1);
 
-       if (r < 0)
-               r = -r;
-
-       return (int) r;
+       return r;
 }
 
 static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct libaio_data *ld = td->io_ops->data;
-       struct iocb *iocb = &io_u->iocb;
-       long ret;
 
+       if (ld->iocbs_nr == (int) td->iodepth)
+               return FIO_Q_BUSY;
+
+       /*
+        * fsync is tricky, since it can fail and we need to do it
+        * serialized with other io. the reason is that linux doesn't
+        * support aio fsync yet. So return busy for the case where we
+        * have pending io, to let fio complete those first.
+        */
+       if (io_u->ddir == DDIR_SYNC) {
+               if (ld->iocbs_nr)
+                       return FIO_Q_BUSY;
+               if (fsync(io_u->file->fd) < 0)
+                       io_u->error = errno;
+
+               return FIO_Q_COMPLETED;
+       }
+
+       ld->iocbs[ld->iocbs_nr] = &io_u->iocb;
+       ld->io_us[ld->iocbs_nr] = io_u;
+       ld->iocbs_nr++;
+       return FIO_Q_QUEUED;
+}
+
+static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
+                             unsigned int nr)
+{
+       struct timeval now;
+       unsigned int i;
+
+       fio_gettime(&now, NULL);
+
+       for (i = 0; i < nr; i++) {
+               struct io_u *io_u = io_us[i];
+
+               memcpy(&io_u->issue_time, &now, sizeof(now));
+               io_u_queued(td, io_u);
+       }
+}
+
+static int fio_libaio_commit(struct thread_data *td)
+{
+       struct libaio_data *ld = td->io_ops->data;
+       struct iocb **iocbs;
+       struct io_u **io_us;
+       int ret, iocbs_nr;
+
+       if (!ld->iocbs_nr)
+               return 0;
+
+       iocbs_nr = ld->iocbs_nr;
+       io_us = ld->io_us;
+       iocbs = ld->iocbs;
        do {
-               ret = io_submit(ld->aio_ctx, 1, &iocb);
-               if (ret == 1)
-                       return 0;
-               else if (ret == -EAGAIN || !ret)
+               ret = io_submit(ld->aio_ctx, iocbs_nr, iocbs);
+               if (ret == iocbs_nr) {
+                       fio_libaio_queued(td, io_us, ret);
+                       ret = 0;
+                       break;
+               } else if (ret > 0) {
+                       fio_libaio_queued(td, io_us, ret);
+                       io_us += ret;
+                       iocbs += ret;
+                       iocbs_nr -= ret;
+                       continue;
+               } else if (ret == -EAGAIN || !ret)
                        usleep(100);
                else if (ret == -EINTR)
                        continue;
@@ -86,13 +145,10 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
                        break;
        } while (1);
 
-       if (ret <= 0) {
-               io_u->resid = io_u->buflen;
-               io_u->error = -ret;
-               return 1;
-       }
+       if (!ret)
+               ld->iocbs_nr = 0;
 
-       return 0;
+       return ret;
 }
 
 static int fio_libaio_cancel(struct thread_data *td, struct io_u *io_u)
@@ -108,9 +164,9 @@ static void fio_libaio_cleanup(struct thread_data *td)
 
        if (ld) {
                io_destroy(ld->aio_ctx);
-               if (ld->aio_events)
-                       free(ld->aio_events);
-
+               free(ld->aio_events);
+               free(ld->iocbs);
+               free(ld->io_us);
                free(ld);
                td->io_ops->data = NULL;
        }
@@ -122,13 +178,19 @@ static int fio_libaio_init(struct thread_data *td)
 
        memset(ld, 0, sizeof(*ld));
        if (io_queue_init(td->iodepth, &ld->aio_ctx)) {
-               td_verror(td, errno);
+               td_verror(td, errno, "io_queue_init");
                free(ld);
                return 1;
        }
 
        ld->aio_events = malloc(td->iodepth * sizeof(struct io_event));
        memset(ld->aio_events, 0, td->iodepth * sizeof(struct io_event));
+       ld->iocbs = malloc(td->iodepth * sizeof(struct iocb *));
+       memset(ld->iocbs, 0, sizeof(struct iocb *));
+       ld->io_us = malloc(td->iodepth * sizeof(struct io_u *));
+       memset(ld->io_us, 0, td->iodepth * sizeof(struct io_u *));
+       ld->iocbs_nr = 0;
+
        td->io_ops->data = ld;
        return 0;
 }
@@ -139,6 +201,7 @@ static struct ioengine_ops ioengine = {
        .init           = fio_libaio_init,
        .prep           = fio_libaio_prep,
        .queue          = fio_libaio_queue,
+       .commit         = fio_libaio_commit,
        .cancel         = fio_libaio_cancel,
        .getevents      = fio_libaio_getevents,
        .event          = fio_libaio_event,