X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=iolog.c;h=99f8bc18d8694cca0c141c51d116aced1b4130f2;hb=f1dfb6682460b70d50a87fca49d077edde136072;hp=785e549acee76ed8f40de68615d355bcf32b33d7;hpb=4e1020f893837806fe8cc44b35e6c48c4be4f88c;p=fio.git

diff --git a/iolog.c b/iolog.c
index 785e549a..99f8bc18 100644
--- a/iolog.c
+++ b/iolog.c
@@ -60,14 +60,22 @@ void log_file(struct thread_data *td, struct fio_file *f,
 
 static void iolog_delay(struct thread_data *td, unsigned long delay)
 {
-	unsigned long usec = utime_since_now(&td->last_issue);
-	unsigned long this_delay;
+	uint64_t usec = utime_since_now(&td->last_issue);
+	uint64_t this_delay;
+	struct timeval tv;
 
+	if (delay < td->time_offset) {
+		td->time_offset = 0;
+		return;
+	}
+
+	delay -= td->time_offset;
 	if (delay < usec)
 		return;
 
 	delay -= usec;
 
+	fio_gettime(&tv, NULL);
 	while (delay && !td->terminate) {
 		this_delay = delay;
 		if (this_delay > 500000)
@@ -76,6 +84,12 @@ static void iolog_delay(struct thread_data *td, unsigned long delay)
 		usec_sleep(td, this_delay);
 		delay -= this_delay;
 	}
+
+	usec = utime_since_now(&tv);
+	if (usec > delay)
+		td->time_offset = usec - delay;
+	else
+		td->time_offset = 0;
 }
 
 static int ipo_special(struct thread_data *td, struct io_piece *ipo)