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 18dcf9ddfad59d753a2cf4b71061065dc6baf6fc..bd8ebb8b65553fe1c8067815811b8a9393b788dc 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -32,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;
@@ -64,11 +64,11 @@ 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);
@@ -103,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;
        }
 
@@ -186,14 +193,8 @@ 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));
-       static int warn_print;
        int err;
 
-       if (td->o.iodepth > 1 && !td->o.odirect && !warn_print) {
-               log_info("fio: libaio engine is only async for non-buffered IO\n");
-               warn_print = 1;
-       }
-
        memset(ld, 0, sizeof(*ld));
 
        err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
@@ -229,6 +230,7 @@ static struct ioengine_ops ioengine = {
        .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 */