Add strong madvise() hint for cache pruning

[fio.git] / engines / guasi.c

diff --git a/engines/guasi.c b/engines/guasi.c
index 2edcffdedb5af9787477823768148f66c671a036..15d4801ad2ae1f37d9710d02254acb61d67a7bda 100644 (file)
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -20,11 +20,13 @@
 #include <assert.h>
 
 #include "../fio.h"
 #include <assert.h>
 
 #include "../fio.h"

-#include "../os.h"

 
 #ifdef FIO_HAVE_GUASI
 
 #define GFIO_MIN_THREADS 32
 
 #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>
 
 #include <guasi.h>
 #include <guasi_syscalls.h>


@@ -35,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;


@@ -64,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) {
 
        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;
                return NULL;
        }
        io_u = rinf.asid;


@@ -87,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;


@@ -105,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 {
                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;
                        break;

+               }

                n += r;
                if (n >= min)
                        break;
                n += r;
                if (n >= min)
                        break;


@@ -122,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;


@@ -131,15 +135,22 @@ static int fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
        return FIO_Q_QUEUED;
 }
 
        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 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);
        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)
 }
 
 static int fio_guasi_commit(struct thread_data *td)


@@ -149,9 +160,10 @@ static int fio_guasi_commit(struct thread_data *td)
        struct io_u *io_u;
        struct fio_file *f;
 
        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];
        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)
                f = io_u->file;
                io_u->greq = NULL;
                if (io_u->ddir == DDIR_READ)


@@ -162,31 +174,28 @@ static int fio_guasi_commit(struct thread_data *td)
                        io_u->greq = guasi__pwrite(ld->hctx, ld, io_u, 0,
                                                   f->fd, io_u->xfer_buf, io_u->xfer_buflen,
                                                   io_u->offset);
                        io_u->greq = guasi__pwrite(ld->hctx, ld, io_u, 0,
                                                   f->fd, io_u->xfer_buf, io_u->xfer_buflen,
                                                   io_u->offset);

-               else if (io_u->ddir == DDIR_SYNC)
+               else if (ddir_sync(io_u->ddir))

                        io_u->greq = guasi__fsync(ld->hctx, ld, io_u, 0, f->fd);
                else {
                        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);
                }
                                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) {
+                       log_err("fio_guasi_commit() FAILED: submit failed (%s)\n",
+                               strerror(errno));

                        return -1;
                }
        }
                        return -1;
                }
        }

+       fio_guasi_queued(td, ld->io_us, i);

        ld->queued_nr = 0;
        GDBG_PRINT(("fio_guasi_commit() -> %d\n", i));
 
        return 0;
 }
 
        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);
        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);


@@ -197,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;
 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) {
 
        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);
                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));
 }
        }
        GDBG_PRINT(("fio_guasi_cleanup(%p) DONE\n", ld));
 }


@@ -217,6 +228,8 @@ 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;
        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 (maxthr > GFIO_MAX_THREADS)
+               maxthr = GFIO_MAX_THREADS;

        if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1)) == NULL) {
                td_verror(td, errno, "guasi_create");
                free(ld);
        if ((ld->hctx = guasi_create(GFIO_MIN_THREADS, maxthr, 1)) == NULL) {
                td_verror(td, errno, "guasi_create");
                free(ld);


@@ -248,6 +261,7 @@ static struct ioengine_ops ioengine = {
        .cleanup        = fio_guasi_cleanup,
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,
        .cleanup        = fio_guasi_cleanup,
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,

+       .get_file_size  = generic_get_file_size,

 };
 
 #else /* FIO_HAVE_GUASI */
 };
 
 #else /* FIO_HAVE_GUASI */