Issue time fixup for guasi/libaio

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 8975591d080acb0efc55894e2f40ec830df9d1fd..8073d1b74dc8ca0a815b1dc4577953b39a804506 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -195,9 +195,13 @@ int td_io_getevents(struct thread_data *td, unsigned int min, unsigned int max,
                if (r < 0)
                        goto out;
        }
+       if (max > td->cur_depth)
+               max = td->cur_depth;
+       if (min > max)
+               max = min;
 
        r = 0;
-       if (td->io_ops->getevents)
+       if (max && td->io_ops->getevents)
                r = td->io_ops->getevents(td, min, max, t);
 out:
        if (r >= 0)
@@ -222,16 +226,15 @@ 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);
-               memcpy(&td->last_issue, &io_u->issue_time,
-                                       sizeof(struct timeval));
+               if (fio_fill_issue_time(td))
+                       fio_gettime(&io_u->issue_time, NULL);
 
                /*
-                * for a sync engine, set the timeout upfront
+                * only used for iolog
                 */
-               if (mtime_since(&td->timeout_end, &io_u->issue_time)
-                   < IO_U_TIMEOUT)
-                       io_u_set_timeout(td);
+               if (td->o.read_iolog_file)
+                       memcpy(&td->last_issue, &io_u->issue_time,
+                                       sizeof(struct timeval));
        }
 
        if (io_u->ddir != DDIR_SYNC)
@@ -267,18 +270,15 @@ 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);
-               memcpy(&td->last_issue, &io_u->issue_time,
-                               sizeof(struct timeval));
+               if (fio_fill_issue_time(td))
+                       fio_gettime(&io_u->issue_time, NULL);
 
                /*
-                * async engine, set the timeout here
+                * only used for iolog
                 */
-               if (ret == FIO_Q_QUEUED &&
-                   (mtime_since(&td->timeout_end, &io_u->issue_time)
-                       < IO_U_TIMEOUT)) {
-                       io_u_set_timeout(td);
-               }
+               if (td->o.read_iolog_file)
+                       memcpy(&td->last_issue, &io_u->issue_time,
+                                       sizeof(struct timeval));
        }
 
        return ret;