GUASI engine: free lingering requests from the buffer on cleanup

[fio.git] / engines / guasi.c

diff --git a/engines/guasi.c b/engines/guasi.c
index 2edcffdedb5af9787477823768148f66c671a036..c083eb361472e97db80ea3ddba7d5a20605d8af0 100644 (file)
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -25,6 +25,9 @@
 #ifdef FIO_HAVE_GUASI
 
 #define GFIO_MIN_THREADS 32
+#ifndef GFIO_MAX_THREADS
+#define GFIO_MAX_THREADS 2000
+#endif
 
 #include <guasi.h>
 #include <guasi_syscalls.h>
@@ -105,9 +108,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) {
+                       fprintf(stderr, "guasi_fetch() FAILED! (%d)\n", r);
                        break;
+               }
                n += r;
                if (n >= min)
                        break;
@@ -131,15 +137,18 @@ 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];
 
        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)
@@ -149,9 +158,10 @@ static int fio_guasi_commit(struct thread_data *td)
        struct io_u *io_u;
        struct fio_file *f;
 
-       GDBG_PRINT(("fio_guasi_commit()\n"));
+       GDBG_PRINT(("fio_guasi_commit(%d)\n", ld->queued_nr));
        for (i = 0; i < ld->queued_nr; i++) {
                io_u = ld->io_us[i];
+               GDBG_PRINT(("fio_guasi_commit(%d) --> %p\n", i, io_u));
                f = io_u->file;
                io_u->greq = NULL;
                if (io_u->ddir == DDIR_READ)
@@ -168,14 +178,13 @@ static int fio_guasi_commit(struct thread_data *td)
                        fprintf(stderr, "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 {
-                       perror("guasi submit");
-                       fprintf(stderr, "fio_guasi_commit() FAILED: submit failed\n");
+               if (io_u->greq == NULL) {
+                       fprintf(stderr, "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));
 
@@ -197,9 +206,12 @@ 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);
@@ -217,7 +229,9 @@ static int fio_guasi_init(struct thread_data *td)
        GDBG_PRINT(("fio_guasi_init(): depth=%d\n", td->o.iodepth));
        memset(ld, 0, sizeof(*ld));
        maxthr = td->o.iodepth > GFIO_MIN_THREADS ? td->o.iodepth: GFIO_MIN_THREADS;
-       if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1)) == NULL) {
+       if (maxthr > GFIO_MAX_THREADS)
+               maxthr = GFIO_MAX_THREADS;
+       if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1, 0)) == NULL) {
                td_verror(td, errno, "guasi_create");
                free(ld);
                return 1;