sg engine: IO should be done sync of O_SYNC and O_DIRECT

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index bd702e30f132ab082a69add4b729ca9e6dd6d9b5..bd8ebb8b65553fe1c8067815811b8a9393b788dc 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
 
@@ -31,7 +32,7 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
                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->xfer_buf, io_u->xfer_buflen, io_u->offset);
-       else if (io_u->ddir == DDIR_SYNC)
+       else if (ddir_sync(io_u->ddir))
                io_prep_fsync(&io_u->iocb, f->fd);
        else
                return 1;
@@ -42,19 +43,32 @@ 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,
-                               struct timespec *t)
+static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
+                               unsigned int max, struct timespec *t)
 {
        struct libaio_data *ld = td->io_ops->data;
-       long r;
+       int r;
 
        do {
                r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
-               if (r >= min)
+               if (r >= (int) min)
                        break;
                else if (r == -EAGAIN) {
                        usleep(100);
@@ -72,7 +86,9 @@ 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)
+       fio_ro_check(td, io_u);
+
+       if (ld->iocbs_nr == (int) td->o.iodepth)
                return FIO_Q_BUSY;
 
        /*
@@ -87,6 +103,13 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
                if (fsync(io_u->file->fd) < 0)
                        io_u->error = errno;
 
+               return FIO_Q_COMPLETED;
+       } else if (io_u->ddir == DDIR_DATASYNC) {
+               if (ld->iocbs_nr)
+                       return FIO_Q_BUSY;
+               if (fdatasync(io_u->file->fd) < 0)
+                       io_u->error = errno;
+
                return FIO_Q_COMPLETED;
        }
 
@@ -102,6 +125,9 @@ static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
        struct timeval now;
        unsigned int i;
 
+       if (!fio_fill_issue_time(td))
+               return;
+
        fio_gettime(&now, NULL);
 
        for (i = 0; i < nr; i++) {
@@ -117,36 +143,29 @@ 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;
+       int ret;
 
        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) {
+               ret = io_submit(ld->aio_ctx, ld->iocbs_nr, iocbs);
+               if (ret > 0) {
                        fio_libaio_queued(td, io_us, ret);
+                       io_u_mark_submit(td, ret);
+                       ld->iocbs_nr -= ret;
                        io_us += ret;
                        iocbs += ret;
-                       iocbs_nr -= ret;
-                       continue;
-               } else if (ret == -EAGAIN || !ret)
-                       usleep(100);
-               else if (ret == -EINTR)
+                       ret = 0;
+               } else if (!ret || ret == -EAGAIN || ret == -EINTR) {
+                       if (!ret)
+                               io_u_mark_submit(td, ret);
                        continue;
-               else
+               } else
                        break;
-       } while (1);
-
-       if (!ret)
-               ld->iocbs_nr = 0;
+       } while (ld->iocbs_nr);
 
        return ret;
 }
@@ -168,27 +187,30 @@ static void fio_libaio_cleanup(struct thread_data *td)
                free(ld->iocbs);
                free(ld->io_us);
                free(ld);
-               td->io_ops->data = NULL;
        }
 }
 
 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, "io_queue_init");
+
+       err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
+       if (err) {
+               td_verror(td, -err, "io_queue_init");
+               log_err("fio: check /proc/sys/fs/aio-max-nr\n");
                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->iodepth * sizeof(struct io_u *));
-       memset(ld->io_us, 0, td->iodepth * sizeof(struct io_u *));
+       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;
@@ -206,6 +228,9 @@ 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,
+       .get_file_size  = generic_get_file_size,
 };
 
 #else /* FIO_HAVE_LIBAIO */