From ac28d90536797e84591babc0ce6ecceb22d67fce Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 28 Oct 2015 09:29:33 +0900 Subject: [PATCH] Fixup bw/iops logging for short runs If an IO loop lasts less than the window for bw or iops logging, we won't log any entries. Make that persist across loops. Signed-off-by: Jens Axboe --- backend.c | 29 +++++++++++++++-------------- fio.h | 2 +- libfio.c | 31 +++++++++++++++++-------------- workqueue.c | 2 +- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/backend.c b/backend.c index b180196e..0a42da3e 100644 --- a/backend.c +++ b/backend.c @@ -1559,27 +1559,28 @@ static void *thread_main(void *data) fio_gettime(&td->epoch, NULL); fio_getrusage(&td->ru_start); + memcpy(&td->bw_sample_time, &td->epoch, sizeof(td->epoch)); + memcpy(&td->iops_sample_time, &td->epoch, sizeof(td->epoch)); + + if (o->ratemin[DDIR_READ] || o->ratemin[DDIR_WRITE] || + o->ratemin[DDIR_TRIM]) { + memcpy(&td->lastrate[DDIR_READ], &td->bw_sample_time, + sizeof(td->bw_sample_time)); + memcpy(&td->lastrate[DDIR_WRITE], &td->bw_sample_time, + sizeof(td->bw_sample_time)); + memcpy(&td->lastrate[DDIR_TRIM], &td->bw_sample_time, + sizeof(td->bw_sample_time)); + } + clear_state = 0; while (keep_running(td)) { uint64_t verify_bytes; fio_gettime(&td->start, NULL); - memcpy(&td->bw_sample_time, &td->start, sizeof(td->start)); - memcpy(&td->iops_sample_time, &td->start, sizeof(td->start)); memcpy(&td->tv_cache, &td->start, sizeof(td->start)); - if (o->ratemin[DDIR_READ] || o->ratemin[DDIR_WRITE] || - o->ratemin[DDIR_TRIM]) { - memcpy(&td->lastrate[DDIR_READ], &td->bw_sample_time, - sizeof(td->bw_sample_time)); - memcpy(&td->lastrate[DDIR_WRITE], &td->bw_sample_time, - sizeof(td->bw_sample_time)); - memcpy(&td->lastrate[DDIR_TRIM], &td->bw_sample_time, - sizeof(td->bw_sample_time)); - } - if (clear_state) - clear_io_state(td); + clear_io_state(td, 0); prune_io_piece_log(td); @@ -1617,7 +1618,7 @@ static void *thread_main(void *data) (td->io_ops->flags & FIO_UNIDIR)) continue; - clear_io_state(td); + clear_io_state(td, 0); fio_gettime(&td->start, NULL); diff --git a/fio.h b/fio.h index 2dc445ee..8daf9755 100644 --- a/fio.h +++ b/fio.h @@ -464,7 +464,7 @@ extern int parse_jobs_ini(char *, int, int, int); extern int parse_cmd_line(int, char **, int); extern int fio_backend(void); extern void reset_fio_state(void); -extern void clear_io_state(struct thread_data *); +extern void clear_io_state(struct thread_data *, int); extern int fio_options_parse(struct thread_data *, char **, int, int); extern void fio_keywords_init(void); extern void fio_keywords_exit(void); diff --git a/libfio.c b/libfio.c index d4cad3ec..09591a11 100644 --- a/libfio.c +++ b/libfio.c @@ -77,21 +77,24 @@ static const char *fio_arch_strings[arch_nr] = { "generic" }; -static void reset_io_counters(struct thread_data *td) +static void reset_io_counters(struct thread_data *td, int all) { int ddir; - for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) { - td->stat_io_bytes[ddir] = 0; - td->this_io_bytes[ddir] = 0; - td->stat_io_blocks[ddir] = 0; - td->this_io_blocks[ddir] = 0; - td->rate_bytes[ddir] = 0; - td->rate_blocks[ddir] = 0; - td->bytes_done[ddir] = 0; - td->rate_io_issue_bytes[ddir] = 0; - td->rate_next_io_time[ddir] = 0; + if (all) { + for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) { + td->stat_io_bytes[ddir] = 0; + td->this_io_bytes[ddir] = 0; + td->stat_io_blocks[ddir] = 0; + td->this_io_blocks[ddir] = 0; + td->rate_bytes[ddir] = 0; + td->rate_blocks[ddir] = 0; + td->bytes_done[ddir] = 0; + td->rate_io_issue_bytes[ddir] = 0; + td->rate_next_io_time[ddir] = 0; + } } + td->zone_bytes = 0; td->last_was_sync = 0; @@ -104,12 +107,12 @@ static void reset_io_counters(struct thread_data *td) td->nr_done_files = 0; } -void clear_io_state(struct thread_data *td) +void clear_io_state(struct thread_data *td, int all) { struct fio_file *f; unsigned int i; - reset_io_counters(td); + reset_io_counters(td, all); close_files(td); for_each_file(td, f, i) { @@ -129,7 +132,7 @@ void reset_all_stats(struct thread_data *td) struct timeval tv; int i; - reset_io_counters(td); + reset_io_counters(td, 1); for (i = 0; i < DDIR_RWDIR_CNT; i++) { td->io_bytes[i] = 0; diff --git a/workqueue.c b/workqueue.c index 60e6ab28..7a69be21 100644 --- a/workqueue.c +++ b/workqueue.c @@ -186,7 +186,7 @@ static int init_submit_worker(struct submit_worker *sw) fio_gettime(&td->epoch, NULL); fio_getrusage(&td->ru_start); - clear_io_state(td); + clear_io_state(td, 1); td_set_runstate(td, TD_RUNNING); td->flags |= TD_F_CHILD; -- 2.25.1