ioengines: Fix td->io_issues[ddir] over decrement

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index b89a121b4526706cff19017b80ad2328a8687581..1b58168608046390146765b7f546c9b9d964736e 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -22,35 +22,31 @@
 
 static FLIST_HEAD(engine_list);
 
-static int check_engine_ops(struct ioengine_ops *ops)
+static bool check_engine_ops(struct ioengine_ops *ops)
 {
        if (ops->version != FIO_IOOPS_VERSION) {
                log_err("bad ioops version %d (want %d)\n", ops->version,
                                                        FIO_IOOPS_VERSION);
-               return 1;
+               return true;
        }
 
        if (!ops->queue) {
                log_err("%s: no queue handler\n", ops->name);
-               return 1;
+               return true;
        }
 
        /*
         * sync engines only need a ->queue()
         */
        if (ops->flags & FIO_SYNCIO)
-               return 0;
+               return false;
 
-       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->event || !ops->getevents) {
+               log_err("%s: no event/getevents handler\n", ops->name);
+               return true;
        }
 
-       return 0;
+       return false;
 }
 
 void unregister_ioengine(struct ioengine_ops *ops)
@@ -123,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);
 
        /*
@@ -157,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;
 }
 
 /*
@@ -177,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;
 }
 
@@ -190,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);
@@ -268,7 +260,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
        fio_ro_check(td, io_u);
 
        assert((io_u->flags & IO_U_F_FLIGHT) == 0);
-       io_u_set(io_u, IO_U_F_FLIGHT);
+       io_u_set(td, io_u, IO_U_F_FLIGHT);
 
        assert(fio_file_open(io_u->file));
 
@@ -280,7 +272,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
        io_u->error = 0;
        io_u->resid = 0;
 
-       if (td->io_ops->flags & FIO_SYNCIO) {
+       if (td_ioengine_flagged(td, FIO_SYNCIO)) {
                if (fio_fill_issue_time(td))
                        fio_gettime(&io_u->issue_time, NULL);
 
@@ -306,6 +298,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
                td->io_issues[ddir]--;
                td->io_issue_bytes[ddir] -= buflen;
                td->rate_io_issue_bytes[ddir] -= buflen;
+               io_u_clear(td, io_u, IO_U_F_FLIGHT);
        }
 
        /*
@@ -354,7 +347,7 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
                }
        }
 
-       if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
+       if (!td_ioengine_flagged(td, FIO_SYNCIO)) {
                if (fio_fill_issue_time(td))
                        fio_gettime(&io_u->issue_time, NULL);
 
@@ -383,7 +376,7 @@ int td_io_init(struct thread_data *td)
                        td->error = ret;
        }
 
-       if (!ret && (td->io_ops->flags & FIO_NOIO))
+       if (!ret && td_ioengine_flagged(td, FIO_NOIO))
                td->flags |= TD_F_NOIO;
 
        return ret;
@@ -449,7 +442,7 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
                }
        }
 
-       if (td->io_ops->flags & FIO_DISKLESSIO)
+       if (td_ioengine_flagged(td, FIO_DISKLESSIO))
                goto done;
 
        if (td->o.invalidate_cache && file_invalidate_cache(td, f))
@@ -491,7 +484,12 @@ int td_io_open_file(struct thread_data *td, struct fio_file *f)
 
                if (ret) {
                        td_verror(td, ret, "fio_set_odirect");
-                       log_err("fio: the file system does not seem to support direct IO\n");
+                       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;
                }
        }
@@ -529,8 +527,15 @@ int td_io_unlink_file(struct thread_data *td, struct fio_file *f)
 {
        if (td->io_ops->unlink_file)
                return td->io_ops->unlink_file(td, f);
-       else
-               return unlink(f->file_name);
+       else {
+               int ret;
+
+               ret = unlink(f->file_name);
+               if (ret < 0)
+                       return errno;
+
+               return 0;
+       }
 }
 
 int td_io_get_file_size(struct thread_data *td, struct fio_file *f)