[PATCH] Be nicer about cleaning up allocated memory

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index abc385303d86c466ba34ed261a5624e2546e03de..9b1ad60692e0e7b76bfd3296e9bab64bd566dcd6 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -14,9 +14,34 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.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];
@@ -52,6 +77,14 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
                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;
@@ -69,3 +102,40 @@ void close_ioengine(struct thread_data *td)
        free(td->io_ops);
        td->io_ops = NULL;
 }
+
+int td_io_prep(struct thread_data *td, struct io_u *io_u)
+{
+       if (td->io_ops->prep && td->io_ops->prep(td, io_u))
+               return 1;
+
+       return 0;
+}
+
+int td_io_sync(struct thread_data *td, struct fio_file *f)
+{
+       if (td->io_ops->sync)
+               return td->io_ops->sync(td, f);
+
+       return 0;
+}
+
+int td_io_getevents(struct thread_data *td, int min, int max,
+                   struct timespec *t)
+{
+       return td->io_ops->getevents(td, min, max, t);
+}
+
+int td_io_queue(struct thread_data *td, struct io_u *io_u)
+{
+       gettimeofday(&io_u->issue_time, NULL);
+
+       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;
+}