iolog: account for wasted time in ipo stall
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/fio.h b/fio.h
index 0601b37..5e352c6 100644
--- a/fio.h
+++ b/fio.h
@@ -252,6 +252,7 @@
struct timeval start; /* start of this loop */
struct timeval epoch; /* time job was started */
struct timeval last_issue;
+ long time_offset;
struct timeval tv_cache;
struct timeval terminate_time;
unsigned int tv_cache_nr;
diff --git a/iolog.c b/iolog.c
index 785e549..99f8bc1 100644
--- a/iolog.c
+++ b/iolog.c
@@ -60,14 +60,22 @@
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 @@
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)