From b392f36daf7a6c2895d899320fa89d35722567c2 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 22 Jul 2016 13:19:31 -0600 Subject: [PATCH] log: fix averaged latency logging We inadvertently broke that in the previous commit, fix it up. Fixes: d454a205f81e ("log: fix missing entries") Signed-off-by: Jens Axboe --- iolog.h | 7 +++++++ stat.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/iolog.h b/iolog.h index a58e3f09..0438fa7b 100644 --- a/iolog.h +++ b/iolog.h @@ -230,6 +230,13 @@ static inline bool per_unit_log(struct io_log *log) return log && !log->avg_msec; } +static inline bool inline_log(struct io_log *log) +{ + return log->log_type == IO_LOG_TYPE_LAT || + log->log_type == IO_LOG_TYPE_CLAT || + log->log_type == IO_LOG_TYPE_SLAT; +} + extern void finalize_logs(struct thread_data *td, bool); extern void setup_log(struct io_log **, struct log_params *, const char *); extern void flush_log(struct io_log *, bool); diff --git a/stat.c b/stat.c index 9171e9b7..7a35117a 100644 --- a/stat.c +++ b/stat.c @@ -2142,7 +2142,7 @@ static long add_log_sample(struct thread_data *td, struct io_log *iolog, if (this_window < iolog->avg_msec) { int diff = iolog->avg_msec - this_window; - if (diff > LOG_MSEC_SLACK) + if (inline_log(iolog) || diff > LOG_MSEC_SLACK) return diff; } -- 2.25.1