[PATCH] File creation and info fixes

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 17909636527175091a6296beff1d95ad65cbd9ac..abc385303d86c466ba34ed261a5624e2546e03de 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -20,7 +20,7 @@
 struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
 {
        char engine[16], engine_lib[256];
-       struct ioengine_ops *ops;
+       struct ioengine_ops *ops, *ret;
        void *dlhandle;
 
        strcpy(engine, name);
@@ -31,7 +31,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 +52,12 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, char *name)
                return NULL;
        }
 
-       ops->dlhandle = dlhandle;
-       return ops;
+       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 +66,6 @@ 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;
 }