Issue time fixup for guasi/libaio

[fio.git] / engines / guasi.c

diff --git a/engines/guasi.c b/engines/guasi.c
index 1d3c77f6bce16752eb688928c523d64fcf23b1bb..4ae014307bd88cfcd1d1c9df763fd4d34d08a568 100644 (file)
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -37,9 +37,6 @@
 #define GDBG_PRINT(a) (void) 0
 #endif
 
 #define GDBG_PRINT(a) (void) 0
 #endif
 

-#define STFU_GCC(a) a = a
-
-

 struct guasi_data {
        guasi_t hctx;
        int max_reqs;
 struct guasi_data {
        guasi_t hctx;
        int max_reqs;


@@ -89,8 +86,8 @@ static struct io_u *fio_guasi_event(struct thread_data *td, int event)
        return io_u;
 }
 
        return io_u;
 }
 

-static int fio_guasi_getevents(struct thread_data *td, int min, int max,
-                              struct timespec *t)
+static int fio_guasi_getevents(struct thread_data *td, unsigned int min,
+                              unsigned int max, struct timespec *t)

 {
        struct guasi_data *ld = td->io_ops->data;
        int n, r;
 {
        struct guasi_data *ld = td->io_ops->data;
        int n, r;


@@ -127,6 +124,8 @@ static int fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct guasi_data *ld = td->io_ops->data;
 
 {
        struct guasi_data *ld = td->io_ops->data;
 

+       fio_ro_check(td, io_u);
+

        GDBG_PRINT(("fio_guasi_queue(%p)\n", io_u));
        if (ld->queued_nr == (int) td->o.iodepth)
                return FIO_Q_BUSY;
        GDBG_PRINT(("fio_guasi_queue(%p)\n", io_u));
        if (ld->queued_nr == (int) td->o.iodepth)
                return FIO_Q_BUSY;


@@ -142,6 +141,10 @@ static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us, int nr
        struct io_u *io_u;
        struct timeval now;
 
        struct io_u *io_u;
        struct timeval now;
 

+       if (!fio_fill_issue_time(td))
+               return;
+
+       io_u_mark_submit(td, nr);

        fio_gettime(&now, NULL);
        for (i = 0; i < nr; i++) {
                io_u = io_us[i];
        fio_gettime(&now, NULL);
        for (i = 0; i < nr; i++) {
                io_u = io_us[i];


@@ -190,11 +193,9 @@ static int fio_guasi_commit(struct thread_data *td)
        return 0;
 }
 
        return 0;
 }
 

-static int fio_guasi_cancel(struct thread_data *td, struct io_u *io_u)
+static int fio_guasi_cancel(struct thread_data fio_unused *td,
+                           struct io_u *io_u)

 {
 {

-       struct guasi_data *ld = td->io_ops->data;
-
-       STFU_GCC(ld);

        GDBG_PRINT(("fio_guasi_cancel(%p) req=%p\n", io_u, io_u->greq));
        if (io_u->greq != NULL)
                guasi_req_cancel(io_u->greq);
        GDBG_PRINT(("fio_guasi_cancel(%p) req=%p\n", io_u, io_u->greq));
        if (io_u->greq != NULL)
                guasi_req_cancel(io_u->greq);


@@ -215,7 +216,6 @@ static void fio_guasi_cleanup(struct thread_data *td)
                free(ld->reqs);
                free(ld->io_us);
                free(ld);
                free(ld->reqs);
                free(ld->io_us);
                free(ld);

-               td->io_ops->data = NULL;

        }
        GDBG_PRINT(("fio_guasi_cleanup(%p) DONE\n", ld));
 }
        }
        GDBG_PRINT(("fio_guasi_cleanup(%p) DONE\n", ld));
 }


@@ -230,7 +230,7 @@ static int fio_guasi_init(struct thread_data *td)
        maxthr = td->o.iodepth > GFIO_MIN_THREADS ? td->o.iodepth: GFIO_MIN_THREADS;
        if (maxthr > GFIO_MAX_THREADS)
                maxthr = GFIO_MAX_THREADS;
        maxthr = td->o.iodepth > GFIO_MIN_THREADS ? td->o.iodepth: GFIO_MIN_THREADS;
        if (maxthr > GFIO_MAX_THREADS)
                maxthr = GFIO_MAX_THREADS;

-       if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1, 0)) == NULL) {
+       if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1)) == NULL) {

                td_verror(td, errno, "guasi_create");
                free(ld);
                return 1;
                td_verror(td, errno, "guasi_create");
                free(ld);
                return 1;