add simple fio.service to start fio server with systemd

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index e2e7280a8edcd0b46a2a2c9daa56914483cca143..4129ac2363b9757baf89e54788f94b656746e824 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -119,17 +119,18 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
                return NULL;
        }
 
-       ops->dlhandle = dlhandle;
+       td->io_ops_dlhandle = dlhandle;
        return ops;
 }
 
 struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
 {
-       struct ioengine_ops *ops, *ret;
-       char engine[16];
+       struct ioengine_ops *ops;
+       char engine[64];
 
        dprint(FD_IO, "load ioengine %s\n", name);
 
+       engine[sizeof(engine) - 1] = '\0';
        strncpy(engine, name, sizeof(engine) - 1);
 
        /*
@@ -153,11 +154,7 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
        if (check_engine_ops(ops))
                return NULL;
 
-       ret = malloc(sizeof(*ret));
-       memcpy(ret, ops, sizeof(*ret));
-       ret->data = NULL;
-
-       return ret;
+       return ops;
 }
 
 /*
@@ -173,10 +170,9 @@ void free_ioengine(struct thread_data *td)
                td->eo = NULL;
        }
 
-       if (td->io_ops->dlhandle)
-               dlclose(td->io_ops->dlhandle);
+       if (td->io_ops_dlhandle)
+               dlclose(td->io_ops_dlhandle);
 
-       free(td->io_ops);
        td->io_ops = NULL;
 }
 
@@ -186,7 +182,7 @@ void close_ioengine(struct thread_data *td)
 
        if (td->io_ops->cleanup) {
                td->io_ops->cleanup(td);
-               td->io_ops->data = NULL;
+               td->io_ops_data = NULL;
        }
 
        free_ioengine(td);