[PATCH] Implement file syncing as data direction

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 5a321653418b97a467fb833107e7e3d120177321..bb46c293e3aed69dffd681095381fc1cd4a39344 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -14,9 +14,34 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>

+

 #include "fio.h"
 #include "os.h"
 
 #include "fio.h"
 #include "os.h"
 

+static int check_engine_ops(struct ioengine_ops *ops)
+{
+       /*
+        * cpu thread doesn't need to provide anything
+        */
+       if (ops->flags & FIO_CPUIO)
+               return 0;
+
+       if (!ops->event) {
+               log_err("%s: no event handler)\n", ops->name);
+               return 1;
+       }
+       if (!ops->getevents) {
+               log_err("%s: no getevents handler)\n", ops->name);
+               return 1;
+       }
+       if (!ops->queue) {
+               log_err("%s: no queue handler)\n", ops->name);
+               return 1;
+       }
+               
+       return 0;
+}
+

 struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
 {
        char engine[16], engine_lib[256];
 struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
 {
        char engine[16], engine_lib[256];


@@ -52,6 +77,14 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
                return NULL;
        }
 
                return NULL;
        }
 

+       /*
+        * Check that the required methods are there.
+        */
+       if (check_engine_ops(ops)) {
+               dlclose(dlhandle);
+               return NULL;
+       }
+

        ret = malloc(sizeof(*ret));
        memcpy(ret, ops, sizeof(*ret));
        ret->data = NULL;
        ret = malloc(sizeof(*ret));
        memcpy(ret, ops, sizeof(*ret));
        ret->data = NULL;


@@ -80,8 +113,40 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u)
 
 int td_io_sync(struct thread_data *td, struct fio_file *f)
 {
 
 int td_io_sync(struct thread_data *td, struct fio_file *f)
 {

-       if (td->io_ops->sync)
-               return td->io_ops->sync(td, f);
+       struct io_u *io_u = __get_io_u(td);
+       struct io_completion_data icd;
+       int ret;
+
+       if (!io_u)
+               return 1;
+
+       io_u->ddir = DDIR_SYNC;
+       io_u->file = f;
+
+       if (td_io_prep(td, io_u)) {
+               put_io_u(td, io_u);
+               return 1;
+       }
+
+       ret = td_io_queue(td, io_u);
+       if (ret) {
+               put_io_u(td, io_u);
+               td_verror(td, ret);
+               return 1;
+       }
+
+       ret = td_io_getevents(td, 1, td->cur_depth, NULL);
+       if (ret < 0) {
+               td_verror(td, -ret);
+               return 1;
+       }
+
+       icd.nr = ret;
+       ios_completed(td, &icd);
+       if (icd.error) {
+               td_verror(td, icd.error);
+               return 1;
+       }

 
        return 0;
 }
 
        return 0;
 }


@@ -98,3 +163,11 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        return td->io_ops->queue(td, io_u);
 }
 
        return td->io_ops->queue(td, io_u);
 }

+
+int td_io_init(struct thread_data *td)
+{
+       if (td->io_ops->init)
+               return td->io_ops->init(td);
+
+       return 0;
+}