Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 7ef3ff8074d005be36a3ef5d90926dc1cc683a0e..e452f1ca7c55f630c18c49186ece3f091713d0db 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -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);
@@ -118,6 +118,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++) {
@@ -144,13 +147,16 @@ static int fio_libaio_commit(struct thread_data *td)
                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;
                        ret = 0;
-               } else if (!ret || ret == -EAGAIN || ret == -EINTR)
+               } else if (!ret || ret == -EAGAIN || ret == -EINTR) {
+                       if (!ret)
+                               io_u_mark_submit(td, ret);
                        continue;
-               else
+               } else
                        break;
        } while (ld->iocbs_nr);
 
@@ -174,21 +180,14 @@ 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));
-       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);
@@ -224,6 +223,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 */