Issue time fixup for guasi/libaio

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 7ef3ff8074d005be36a3ef5d90926dc1cc683a0e..18dcf9ddfad59d753a2cf4b71061065dc6baf6fc 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -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,7 +180,6 @@ static void fio_libaio_cleanup(struct thread_data *td)
                free(ld->iocbs);
                free(ld->io_us);
                free(ld);
-               td->io_ops->data = NULL;
        }
 }