projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
io_u timeout handling
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index 1704418735367e92e48dfb42f5fb85e0902eed6a..39433207afd6f5984f981eeed52d689c6f6e38db 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-192,17
+192,32
@@
int td_io_queue(struct thread_data *td, struct io_u *io_u)
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
io_u->flags |= IO_U_F_FLIGHT;
assert((io_u->flags & IO_U_F_FLIGHT) == 0);
io_u->flags |= IO_U_F_FLIGHT;
- if (td->io_ops->flags & FIO_SYNCIO)
+ if (td->io_ops->flags & FIO_SYNCIO)
{
fio_gettime(&io_u->issue_time, NULL);
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);
if (io_u->ddir != DDIR_SYNC)
td->io_issues[io_u->ddir]++;
ret = td->io_ops->queue(td, io_u);
- if ((td->io_ops->flags & FIO_SYNCIO) == 0)
+ if ((td->io_ops->flags & FIO_SYNCIO) == 0)
{
fio_gettime(&io_u->issue_time, NULL);
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;
}
return ret;
}