io_u timeout handling

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 2a11ed322ecd49fba5751cf958397da09097c4af..39433207afd6f5984f981eeed52d689c6f6e38db 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
+#include <assert.h>
 
 #include "fio.h"
 #include "os.h"
@@ -66,11 +67,10 @@ void unregister_ioengine(struct ioengine_ops *ops)
        INIT_LIST_HEAD(&ops->list);
 }
 
-int register_ioengine(struct ioengine_ops *ops)
+void register_ioengine(struct ioengine_ops *ops)
 {
        INIT_LIST_HEAD(&ops->list);
        list_add_tail(&ops->list, &engine_list);
-       return 0;
 }
 
 static struct ioengine_ops *find_ioengine(const char *name)
@@ -189,12 +189,35 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 {
        int ret;
 
+       assert((io_u->flags & IO_U_F_FLIGHT) == 0);
+       io_u->flags |= IO_U_F_FLIGHT;
+
+       if (td->io_ops->flags & FIO_SYNCIO) {
+               fio_gettime(&io_u->issue_time, NULL);
+
+               /*
+                * for a sync engine, set the timeout upfront
+                */
+               if (mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+                       io_u_set_timeout(td);
+       }
 
        if (io_u->ddir != DDIR_SYNC)
                td->io_issues[io_u->ddir]++;
 
        ret = td->io_ops->queue(td, io_u);
-       fio_gettime(&io_u->issue_time, NULL);
+
+       if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
+               fio_gettime(&io_u->issue_time, NULL);
+
+               /*
+                * async engine, set the timeout here
+                */
+               if (ret == FIO_Q_QUEUED &&
+                   mtime_since(&td->timeout_end, &io_u->issue_time) < IO_U_TIMEOUT)
+                       io_u_set_timeout(td);
+       }
+
        return ret;
 }