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

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 2d55065bb3e5e2b4c2dc5c72f6d6cad2dc0dcd7f..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);
@@ -281,7 +287,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
                 */
                if (td->o.read_iolog_file)
                        memcpy(&td->last_issue, &io_u->issue_time,
-                                       sizeof(struct timeval));
+                                       sizeof(io_u->issue_time));
        }
 
        if (ddir_rw(ddir)) {
@@ -356,7 +362,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
                 */
                if (td->o.read_iolog_file)
                        memcpy(&td->last_issue, &io_u->issue_time,
-                                       sizeof(struct timeval));
+                                       sizeof(io_u->issue_time));
        }
 
        return ret;
@@ -476,34 +482,27 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
        if (fio_option_is_set(&td->o, write_hint) &&
            (f->filetype == FIO_TYPE_BLOCK || f->filetype == FIO_TYPE_FILE)) {
                uint64_t hint = td->o.write_hint;
+               int cmd;
+
+               /*
+                * For direct IO, we just need/want to set the hint on
+                * the file descriptor. For buffered IO, we need to set
+                * it on the inode.
+                */
+               if (td->o.odirect)
+                       cmd = F_SET_FILE_RW_HINT;
+               else
+                       cmd = F_SET_RW_HINT;
 
-               if (fcntl(f->fd, F_SET_RW_HINT, &hint) < 0) {
+               if (fcntl(f->fd, cmd, &hint) < 0) {
                        td_verror(td, errno, "fcntl write hint");
                        goto err;
                }
        }
 #endif
 
-#ifdef FIO_OS_DIRECTIO
-       /*
-        * Some OS's have a distinct call to mark the file non-buffered,
-        * instead of using O_DIRECT (Solaris)
-        */
-       if (td->o.odirect) {
-               int ret = fio_set_odirect(f->fd);
-
-               if (ret) {
-                       td_verror(td, ret, "fio_set_odirect");
-                       if (ret == ENOTTY) { /* ENOTTY suggests RAW device or ZFS */
-                               log_err("fio: doing directIO to RAW devices or ZFS not supported\n");
-                       } else {
-                               log_err("fio: the file system does not seem to support direct IO\n");
-                       }
-
-                       goto err;
-               }
-       }
-#endif
+       if (td->o.odirect && !OS_O_DIRECT && fio_set_directio(td, f))
+               goto err;
 
 done:
        log_file(td, f, FIO_LOG_OPEN_FILE);
@@ -580,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;