X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.c;h=99f8bc18d8694cca0c141c51d116aced1b4130f2;hp=4a7d939af251c77ae2de82d2ad57b15a9f04d4b4;hb=967d1b631d2a69df41feca144632256e37cc5aec;hpb=b220c6d6f37fc55760d66728f6f9f521ea2f9b46 diff --git a/iolog.c b/iolog.c index 4a7d939a..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) @@ -173,7 +187,7 @@ void prune_io_piece_log(struct thread_data *td) } while (!flist_empty(&td->io_hist_list)) { - ipo = flist_entry(&td->io_hist_list, struct io_piece, list); + ipo = flist_first_entry(&td->io_hist_list, struct io_piece, list); flist_del(&ipo->list); remove_trim_entry(td, ipo); td->io_hist_len--; @@ -871,18 +885,18 @@ int iolog_file_inflate(const char *file) */ total = ic.len; do { - size_t ret; + size_t iret; - ret = inflate_chunk(&ic, 1, stdout, &stream, &iter); - total -= ret; + iret = inflate_chunk(&ic, 1, stdout, &stream, &iter); + total -= iret; if (!total) break; if (iter.err) break; ic.seq++; - ic.len -= ret; - ic.buf += ret; + ic.len -= iret; + ic.buf += iret; } while (1); if (iter.seq) {