Issue time fixup for guasi/libaio

[fio.git] / engines / guasi.c

diff --git a/engines/guasi.c b/engines/guasi.c
index 34b42e71454916ffa0492d378bb60bbac3e400e4..4ae014307bd88cfcd1d1c9df763fd4d34d08a568 100644 (file)
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -20,13 +20,12 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_GUASI
 
 #define GFIO_MIN_THREADS 32
 #ifndef GFIO_MAX_THREADS
-#define GFIO_MAX_THREADS 280
+#define GFIO_MAX_THREADS 2000
 #endif
 
 #include <guasi.h>
@@ -38,9 +37,6 @@
 #define GDBG_PRINT(a) (void) 0
 #endif
 
-#define STFU_GCC(a) a = a
-
-
 struct guasi_data {
        guasi_t hctx;
        int max_reqs;
@@ -67,7 +63,7 @@ static struct io_u *fio_guasi_event(struct thread_data *td, int event)
 
        GDBG_PRINT(("fio_guasi_event(%d)\n", event));
        if (guasi_req_info(ld->reqs[event], &rinf) < 0) {
-               fprintf(stderr, "guasi_req_info(%d) FAILED!\n", event);
+               log_err("guasi_req_info(%d) FAILED!\n", event);
                return NULL;
        }
        io_u = rinf.asid;
@@ -90,8 +86,8 @@ static struct io_u *fio_guasi_event(struct thread_data *td, int event)
        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;
@@ -108,9 +104,12 @@ static int fio_guasi_getevents(struct thread_data *td, int min, int max,
                guasi_req_free(ld->reqs[n]);
        n = 0;
        do {
-               r = guasi_fetch(ld->hctx, ld->reqs + n, max - n, timeo);
-               if (r < 0)
+               r = guasi_fetch(ld->hctx, ld->reqs + n, min - n,
+                               max - n, timeo);
+               if (r < 0) {
+                       log_err("guasi_fetch() FAILED! (%d)\n", r);
                        break;
+               }
                n += r;
                if (n >= min)
                        break;
@@ -125,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;
 
+       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;
@@ -134,15 +135,22 @@ static int fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
        return FIO_Q_QUEUED;
 }
 
-static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us,
-                            unsigned int nr)
+static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us, int nr)
 {
+       int i;
+       struct io_u *io_u;
        struct timeval now;
-       struct io_u *io_u = io_us[nr];
 
+       if (!fio_fill_issue_time(td))
+               return;
+
+       io_u_mark_submit(td, nr);
        fio_gettime(&now, NULL);
-       memcpy(&io_u->issue_time, &now, sizeof(now));
-       io_u_queued(td, io_u);
+       for (i = 0; i < nr; i++) {
+               io_u = io_us[i];
+               memcpy(&io_u->issue_time, &now, sizeof(now));
+               io_u_queued(td, io_u);
+       }
 }
 
 static int fio_guasi_commit(struct thread_data *td)
@@ -169,28 +177,25 @@ static int fio_guasi_commit(struct thread_data *td)
                else if (io_u->ddir == DDIR_SYNC)
                        io_u->greq = guasi__fsync(ld->hctx, ld, io_u, 0, f->fd);
                else {
-                       fprintf(stderr, "fio_guasi_commit() FAILED: unknow request %d\n",
+                       log_err("fio_guasi_commit() FAILED: unknow request %d\n",
                                io_u->ddir);
                }
-               if (io_u->greq != NULL)
-                       fio_guasi_queued(td, ld->io_us, i);
-               else {
-                       fprintf(stderr, "fio_guasi_commit() FAILED: submit failed (%s)\n",
+               if (io_u->greq == NULL) {
+                       log_err("fio_guasi_commit() FAILED: submit failed (%s)\n",
                                strerror(errno));
                        return -1;
                }
        }
+       fio_guasi_queued(td, ld->io_us, i);
        ld->queued_nr = 0;
        GDBG_PRINT(("fio_guasi_commit() -> %d\n", i));
 
        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);
@@ -201,14 +206,16 @@ static int fio_guasi_cancel(struct thread_data *td, struct io_u *io_u)
 static void fio_guasi_cleanup(struct thread_data *td)
 {
        struct guasi_data *ld = td->io_ops->data;
+       int n;
 
        GDBG_PRINT(("fio_guasi_cleanup(%p)\n", ld));
        if (ld) {
+               for (n = 0; n < ld->reqs_nr; n++)
+                       guasi_req_free(ld->reqs[n]);
                guasi_free(ld->hctx);
                free(ld->reqs);
                free(ld->io_us);
                free(ld);
-               td->io_ops->data = NULL;
        }
        GDBG_PRINT(("fio_guasi_cleanup(%p) DONE\n", ld));
 }