From: Jens Axboe Date: Tue, 16 Dec 2014 02:54:57 +0000 (-0700) Subject: backend: use monotonic clock for ETA, if we have it X-Git-Tag: fio-2.2.0~13 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f893b76d5745;p=fio.git backend: use monotonic clock for ETA, if we have it Signed-off-by: Jens Axboe --- diff --git a/backend.c b/backend.c index f1def38b..3df0133f 100644 --- a/backend.c +++ b/backend.c @@ -2104,11 +2104,19 @@ static void *helper_thread_main(void *data) uint64_t sec = DISK_UTIL_MSEC / 1000; uint64_t nsec = (DISK_UTIL_MSEC % 1000) * 1000000; struct timespec ts; + +#if defined(CONFIG_CLOCK_MONOTONIC) + clock_gettime(CLOCK_MONOTONIC, &ts); + ts.tv_sec += sec; + ts.tv_nsec += nsec; +#else struct timeval tv; gettimeofday(&tv, NULL); ts.tv_sec = tv.tv_sec + sec; ts.tv_nsec = (tv.tv_usec * 1000) + nsec; +#endif + if (ts.tv_nsec >= 1000000000ULL) { ts.tv_nsec -= 1000000000ULL; ts.tv_sec++;