X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=39433207afd6f5984f981eeed52d689c6f6e38db;hp=1704418735367e92e48dfb42f5fb85e0902eed6a;hb=433afcb4fe81e775c15af9d39a6f4db8a53d693a;hpb=0c6e75175bcaf8d05bfa88aa8caa584fbb848b74

diff --git a/ioengines.c b/ioengines.c
index 17044187..39433207 100644
--- 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;
 
-	if (td->io_ops->flags & FIO_SYNCIO)
+	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);
 
-	if ((td->io_ops->flags & FIO_SYNCIO) == 0)
+	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;
 }