fix load_ioengine() not to support no "external:" prefix

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 919781c4e8e11a78a62c0e4fa189fdc820a30902..0c631e85e98806921568900f564295fa1e6e4a6e 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -123,25 +123,31 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
        return ops;
 }
 
-struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
+struct ioengine_ops *load_ioengine(struct thread_data *td)
 {
-       struct ioengine_ops *ops;
-       char engine[64];
+       struct ioengine_ops *ops = NULL;
+       const char *name = NULL;
 
-       dprint(FD_IO, "load ioengine %s\n", name);
+       if (strcmp(td->o.ioengine, "external")) {
+               char engine[64];
 
-       engine[sizeof(engine) - 1] = '\0';
-       strncpy(engine, name, sizeof(engine) - 1);
+               name = td->o.ioengine;
+               engine[sizeof(engine) - 1] = '\0';
+               strncpy(engine, name, sizeof(engine) - 1);
 
-       /*
-        * linux libaio has alias names, so convert to what we want
-        */
-       if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
-               strcpy(engine, "libaio");
+               /*
+                * linux libaio has alias names, so convert to what we want
+                */
+               if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
+                       strcpy(engine, "libaio");
 
-       ops = find_ioengine(engine);
-       if (!ops)
+               dprint(FD_IO, "load ioengine %s\n", engine);
+               ops = find_ioengine(engine);
+       } else if (td->o.ioengine_so_path) {
+               name = td->o.ioengine_so_path;
                ops = dlopen_ioengine(td, name);
+       } else
+               log_err("fio: missing external ioengine path\n");
 
        if (!ops) {
                log_err("fio: engine %s not loadable\n", name);
@@ -573,7 +579,8 @@ int fio_show_ioengine_help(const char *engine)
 
        memset(&td, 0, sizeof(td));
 
-       io_ops = load_ioengine(&td, engine);
+       td.o.ioengine = (char *)engine;
+       io_ops = load_ioengine(&td);
        if (!io_ops) {
                log_info("IO engine %s not found\n", engine);
                return 1;