Merge branch 'armv6' of https://github.com/sitsofe/fio

[fio.git] / engines / guasi.c

diff --git a/engines/guasi.c b/engines/guasi.c
index 3802f2c21e4ea4ff9a6db588a41df60e4ee36087..cb26802cce8b8f8acbbb510d715262f9b48fa2a9 100644 (file)
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -3,12 +3,7 @@
  *
  * IO engine using the GUASI library.
  *
- * This is currently disabled. To enable it, execute:
- *
- * $ export EXTFLAGS="-DFIO_HAVE_GUASI"
- * $ export EXTLIBS="-lguasi"
- *
- * before running make. You'll need the GUASI lib as well:
+ * Before running make. You'll need the GUASI lib as well:
  *
  * http://www.xmailserver.org/guasi-lib.html
  *
@@ -21,8 +16,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_GUASI
-
 #define GFIO_MIN_THREADS 32
 #ifndef GFIO_MAX_THREADS
 #define GFIO_MAX_THREADS 2000
@@ -57,7 +50,7 @@ static int fio_guasi_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 
 static struct io_u *fio_guasi_event(struct thread_data *td, int event)
 {
-       struct guasi_data *ld = td->io_ops->data;
+       struct guasi_data *ld = td->io_ops_data;
        struct io_u *io_u;
        struct guasi_reqinfo rinf;
 
@@ -87,9 +80,9 @@ static struct io_u *fio_guasi_event(struct thread_data *td, int event)
 }
 
 static int fio_guasi_getevents(struct thread_data *td, unsigned int min,
-                              unsigned int max, struct timespec *t)
+                              unsigned int max, const struct timespec *t)
 {
-       struct guasi_data *ld = td->io_ops->data;
+       struct guasi_data *ld = td->io_ops_data;
        int n, r;
        long timeo = -1;
 
@@ -120,9 +113,10 @@ static int fio_guasi_getevents(struct thread_data *td, unsigned int min,
        return n;
 }
 
-static int fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status 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);
 
@@ -139,7 +133,7 @@ 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 timespec now;
 
        if (!fio_fill_issue_time(td))
                return;
@@ -155,7 +149,7 @@ static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us, int nr
 
 static int fio_guasi_commit(struct thread_data *td)
 {
-       struct guasi_data *ld = td->io_ops->data;
+       struct guasi_data *ld = td->io_ops_data;
        int i;
        struct io_u *io_u;
        struct fio_file *f;
@@ -174,7 +168,7 @@ 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);
-               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 {
                        log_err("fio_guasi_commit() FAILED: unknow request %d\n",
@@ -205,7 +199,7 @@ static int fio_guasi_cancel(struct thread_data fio_unused *td,
 
 static void fio_guasi_cleanup(struct thread_data *td)
 {
-       struct guasi_data *ld = td->io_ops->data;
+       struct guasi_data *ld = td->io_ops_data;
        int n;
 
        GDBG_PRINT(("fio_guasi_cleanup(%p)\n", ld));
@@ -242,7 +236,7 @@ static int fio_guasi_init(struct thread_data *td)
        ld->queued_nr = 0;
        ld->reqs_nr = 0;
 
-       td->io_ops->data = ld;
+       td->io_ops_data = ld;
        GDBG_PRINT(("fio_guasi_init(): depth=%d -> %p\n", td->o.iodepth, ld));
 
        return 0;
@@ -264,27 +258,6 @@ static struct ioengine_ops ioengine = {
        .get_file_size  = generic_get_file_size,
 };
 
-#else /* FIO_HAVE_GUASI */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_guasi_init(struct thread_data fio_unused *td)
-{
-       fprintf(stderr, "fio: guasi not available\n");
-       return 1;
-}
-
-static struct ioengine_ops ioengine = {
-       .name           = "guasi",
-       .version        = FIO_IOOPS_VERSION,
-       .init           = fio_guasi_init,
-};
-
-#endif
-
 static void fio_init fio_guasi_register(void)
 {
        register_ioengine(&ioengine);