Put the ->real_file_size handling into fio

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 510ecab417b43bf369bb3062d2238435b03e1a4f..871c5a4785d727a72471499ffca93344ff660b1c 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -1,5 +1,7 @@
 /*
- * native linux aio io engine
+ * libaio engine
+ *
+ * IO engine using the Linux native aio interface.
  *
  */
 #include <stdio.h>
@@ -9,7 +11,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_LIBAIO
 
@@ -19,6 +20,7 @@ struct libaio_data {
        io_context_t aio_ctx;
        struct io_event *aio_events;
        struct iocb **iocbs;
+       struct io_u **io_us;
        int iocbs_nr;
 };
 
@@ -41,8 +43,21 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 static struct io_u *fio_libaio_event(struct thread_data *td, int event)
 {
        struct libaio_data *ld = td->io_ops->data;
+       struct io_event *ev;
+       struct io_u *io_u;
+
+       ev = ld->aio_events + event;
+       io_u = ev_to_iou(ev);
+
+       if (ev->res != io_u->xfer_buflen) {
+               if (ev->res > io_u->xfer_buflen)
+                       io_u->error = -ev->res;
+               else
+                       io_u->resid = io_u->xfer_buflen - ev->res;
+       } else
+               io_u->error = 0;
 
-       return ev_to_iou(ld->aio_events + event);
+       return io_u;
 }
 
 static int fio_libaio_getevents(struct thread_data *td, int min, int max,
@@ -71,7 +86,7 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct libaio_data *ld = td->io_ops->data;
 
-       if (ld->iocbs_nr == (int) td->iodepth)
+       if (ld->iocbs_nr == (int) td->o.iodepth)
                return FIO_Q_BUSY;
 
        /*
@@ -90,27 +105,49 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
        }
 
        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, 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;
@@ -141,11 +178,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);
-               if (ld->iocbs)
-                       free(ld->iocbs);
-
+               free(ld->aio_events);
+               free(ld->iocbs);
+               free(ld->io_us);
                free(ld);
                td->io_ops->data = NULL;
        }
@@ -154,18 +189,23 @@ static void fio_libaio_cleanup(struct thread_data *td)
 static int fio_libaio_init(struct thread_data *td)
 {
        struct libaio_data *ld = malloc(sizeof(*ld));
+       int err;
 
        memset(ld, 0, sizeof(*ld));
-       if (io_queue_init(td->iodepth, &ld->aio_ctx)) {
-               td_verror(td, errno);
+
+       err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
+       if (err) {
+               td_verror(td, -err, "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 *));
+       ld->aio_events = malloc(td->o.iodepth * sizeof(struct io_event));
+       memset(ld->aio_events, 0, td->o.iodepth * sizeof(struct io_event));
+       ld->iocbs = malloc(td->o.iodepth * sizeof(struct iocb *));
        memset(ld->iocbs, 0, sizeof(struct iocb *));
+       ld->io_us = malloc(td->o.iodepth * sizeof(struct io_u *));
+       memset(ld->io_us, 0, td->o.iodepth * sizeof(struct io_u *));
        ld->iocbs_nr = 0;
 
        td->io_ops->data = ld;
@@ -183,6 +223,8 @@ static struct ioengine_ops ioengine = {
        .getevents      = fio_libaio_getevents,
        .event          = fio_libaio_event,
        .cleanup        = fio_libaio_cleanup,
+       .open_file      = generic_open_file,
+       .close_file     = generic_close_file,
 };
 
 #else /* FIO_HAVE_LIBAIO */