Issue time fixup for guasi/libaio

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 1688c633db66233fe55caf8284f195d4a7bac8a0..8073d1b74dc8ca0a815b1dc4577953b39a804506 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -226,7 +226,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
        io_u->resid = 0;
 
        if (td->io_ops->flags & FIO_SYNCIO) {
-               fio_gettime(&io_u->issue_time, NULL);
+               if (fio_fill_issue_time(td))
+                       fio_gettime(&io_u->issue_time, NULL);
 
                /*
                 * only used for iolog
@@ -234,13 +235,6 @@ 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));
-
-               /*
-                * 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)
@@ -276,7 +270,8 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
        }
 
        if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
-               fio_gettime(&io_u->issue_time, NULL);
+               if (fio_fill_issue_time(td))
+                       fio_gettime(&io_u->issue_time, NULL);
 
                /*
                 * only used for iolog
@@ -284,15 +279,6 @@ 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));
-
-               /*
-                * 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;