From 0e765365798c54d412e355798ad584a52035f228 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Wed, 9 Dec 2015 09:36:14 +0100 Subject: blkdiscard: fix timeval comparison inclusive usecs We will see if this makes our "--step" tests reliable. CC: Federico Simoncelli Signed-off-by: Ruediger Meier --- sys-utils/blkdiscard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys-utils/blkdiscard.c') diff --git a/sys-utils/blkdiscard.c b/sys-utils/blkdiscard.c index 150689a62..a853a3519 100644 --- a/sys-utils/blkdiscard.c +++ b/sys-utils/blkdiscard.c @@ -197,10 +197,11 @@ int main(int argc, char **argv) err(EXIT_FAILURE, _("%s: BLKDISCARD ioctl failed"), path); } - /* reporting progress */ + /* reporting progress at most once per second */ if (verbose && step) { gettime_monotonic(&now); - if (last.tv_sec < now.tv_sec) { + if (now.tv_sec > last.tv_sec && + (now.tv_usec >= last.tv_usec || now.tv_sec > last.tv_sec + 1)) { print_stats(path, stats); stats[0] = range[0], stats[1] = 0; last = now; -- cgit v1.2.3-55-g7522