From d481e00608dc118e646b6fee9c9292c1ab35448f Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 4 Dec 2009 09:56:32 +0100 Subject: [PATCH] Move back to realtime clock On some systems MONOTONIC still causes a hang. Signed-off-by: Jens Axboe --- gettime.c | 2 +- mutex.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gettime.c b/gettime.c index b1431f32..c0d27e4c 100644 --- a/gettime.c +++ b/gettime.c @@ -130,7 +130,7 @@ gtod: } else { struct timespec ts; - if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0) { + if (clock_gettime(CLOCK_REALTIME, &ts) < 0) { clock_gettime_works = 0; goto gtod; } diff --git a/mutex.c b/mutex.c index 34b3324c..a4474374 100644 --- a/mutex.c +++ b/mutex.c @@ -72,7 +72,6 @@ struct fio_mutex *fio_mutex_init(int value) pthread_condattr_init(&cond); pthread_condattr_setpshared(&cond, mflag); - pthread_condattr_setclock(&cond, CLOCK_MONOTONIC); pthread_cond_init(&mutex->cond, &cond); ret = pthread_mutex_init(&mutex->lock, &attr); @@ -95,7 +94,7 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds) struct timespec t; int ret = 0; - clock_gettime(CLOCK_MONOTONIC, &t); + clock_gettime(CLOCK_REALTIME, &t); t.tv_sec += seconds; pthread_mutex_lock(&mutex->lock); -- 2.25.1