[PATCH] String copy limiting fixes

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 17909636527175091a6296beff1d95ad65cbd9ac..96a96360750038ea87909c8fdfd45f36a89c9d13 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -14,16 +14,41 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
+
 #include "fio.h"
 #include "os.h"
 
-struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
+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, const char *name)
 {
        char engine[16], engine_lib[256];
-       struct ioengine_ops *ops;
+       struct ioengine_ops *ops, *ret;
        void *dlhandle;
 
-       strcpy(engine, name);
+       strncpy(engine, name, sizeof(engine) - 1);
 
        /*
         * linux libaio has alias names, so convert to what we want
@@ -31,7 +56,7 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
        if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
                strcpy(engine, "libaio");
 
-       sprintf(engine_lib, "/usr/local/lib/fio/fio-engine-%s.o", engine);
+       sprintf(engine_lib, "%s/lib/fio/fio-engine-%s.o", fio_inst_prefix, engine);
        dlerror();
        dlhandle = dlopen(engine_lib, RTLD_LAZY);
        if (!dlhandle) {
@@ -52,8 +77,20 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
                return NULL;
        }
 
-       ops->dlhandle = dlhandle;
-       return ops;
+       /*
+        * 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->dlhandle = dlhandle;
+
+       return ret;
 }
 
 void close_ioengine(struct thread_data *td)
@@ -62,4 +99,35 @@ void close_ioengine(struct thread_data *td)
                td->io_ops->cleanup(td);
 
        dlclose(td->io_ops->dlhandle);
+       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_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;
 }