A bunch of fixes

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 9aacc335d906b21b4b5c397c8d26049338bc1b42..77c45f7ff05e1bc40224d2c4a784efa42add0a1c 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -56,12 +56,14 @@ static int check_engine_ops(struct ioengine_ops *ops)
 
 void unregister_ioengine(struct ioengine_ops *ops)
 {
+       dprint(FD_IO, "ioengine %s unregistered\n", ops->name);
        list_del(&ops->list);
        INIT_LIST_HEAD(&ops->list);
 }
 
 void register_ioengine(struct ioengine_ops *ops)
 {
+       dprint(FD_IO, "ioengine %s registered\n", ops->name);
        INIT_LIST_HEAD(&ops->list);
        list_add_tail(&ops->list, &engine_list);
 }
@@ -86,6 +88,8 @@ static struct ioengine_ops *dlopen_ioengine(struct thread_data *td,
        struct ioengine_ops *ops;
        void *dlhandle;
 
+       dprint(FD_IO, "dload engine %s\n", engine_lib);
+
        dlerror();
        dlhandle = dlopen(engine_lib, RTLD_LAZY);
        if (!dlhandle) {
@@ -113,6 +117,8 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
        struct ioengine_ops *ops, *ret;
        char engine[16];
 
+       dprint(FD_IO, "load ioengine %s\n", name);
+
        strncpy(engine, name, sizeof(engine) - 1);
 
        /*
@@ -145,6 +151,8 @@ struct ioengine_ops *load_ioengine(struct thread_data *td, const char *name)
 
 void close_ioengine(struct thread_data *td)
 {
+       dprint(FD_IO, "close ioengine %s\n", td->io_ops->name);
+
        if (td->io_ops->cleanup)
                td->io_ops->cleanup(td);
 
@@ -157,10 +165,15 @@ void close_ioengine(struct thread_data *td)
 
 int td_io_prep(struct thread_data *td, struct io_u *io_u)
 {
+       dprint_io_u(io_u, "prep");
        fio_ro_check(td, io_u);
 
-       if (td->io_ops->prep)
-               return td->io_ops->prep(td, io_u);
+       if (td->io_ops->prep) {
+               int ret = td->io_ops->prep(td, io_u);
+
+               dprint(FD_IO, "->prep(%p)=%d\n", io_u, ret);
+               return ret;
+       }
 
        return 0;
 }
@@ -168,22 +181,27 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u)
 int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
                    struct timespec *t)
 {
-       if (min > 0 && td->io_ops->commit) {
-               int r = td->io_ops->commit(td);
+       int r = 0;
 
+       if (min > 0 && td->io_ops->commit) {
+               r = td->io_ops->commit(td);
                if (r < 0)
-                       return r;
+                       goto out;
        }
-       if (td->io_ops->getevents)
-               return td->io_ops->getevents(td, min, max, t);
 
-       return 0;
+       r = 0;
+       if (td->io_ops->getevents)
+               r = td->io_ops->getevents(td, min, max, t);
+out:
+       dprint(FD_IO, "getevents: %d\n", r);
+       return r;
 }
 
 int td_io_queue(struct thread_data *td, struct io_u *io_u)
 {
        int ret;
 
+       dprint_io_u(io_u, "queue");
        fio_ro_check(td, io_u);
 
        assert((io_u->flags & IO_U_F_FLIGHT) == 0);
@@ -253,6 +271,8 @@ int td_io_init(struct thread_data *td)
 
 int td_io_commit(struct thread_data *td)
 {
+       dprint(FD_IO, "calling ->commit(), depth %d\n", td->cur_depth);
+
        if (!td->cur_depth)
                return 0;