X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=mutex.c;h=3b94beffc7342ae2f13879126e2da3433cb5bbf1;hp=24defcf515ef4d793b250a60b7e52d1386ba1bab;hb=c57f254caa98902968c928d761dd99e1fa18a35c;hpb=58a157d466c8e366234b4ee694f28be73e6e7702

diff --git a/mutex.c b/mutex.c
index 24defcf5..3b94beff 100644
--- a/mutex.c
+++ b/mutex.c
@@ -4,14 +4,18 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <time.h>
+#include <errno.h>
 #include <pthread.h>
 #include <sys/mman.h>
 
+#include "fio.h"
 #include "log.h"
 #include "mutex.h"
 #include "arch/arch.h"
 #include "os/os.h"
 #include "helpers.h"
+#include "time.h"
+#include "gettime.h"
 
 void fio_mutex_remove(struct fio_mutex *mutex)
 {
@@ -57,11 +61,6 @@ struct fio_mutex *fio_mutex_init(int value)
 	pthread_condattr_init(&cond);
 #ifdef FIO_HAVE_PSHARED_MUTEX
 	pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
-#endif
-#ifdef FIO_HAVE_CLOCK_MONOTONIC
-	pthread_condattr_setclock(&cond, CLOCK_MONOTONIC);
-#else
-	pthread_condattr_setclock(&cond, CLOCK_REALTIME);
 #endif
 	pthread_cond_init(&mutex->cond, &cond);
 
@@ -82,23 +81,36 @@ err:
 	return NULL;
 }
 
+static int mutex_timed_out(struct timeval *t, unsigned int seconds)
+{
+	return mtime_since_now(t) >= seconds * 1000;
+}
+
 int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
 {
+	struct timeval tv_s;
 	struct timespec t;
 	int ret = 0;
 
-#ifdef FIO_HAVE_CLOCK_MONOTONIC
-	clock_gettime(CLOCK_MONOTONIC, &t);
-#else
-	clock_gettime(CLOCK_REALTIME, &t);
-#endif
-	t.tv_sec += seconds;
+	gettimeofday(&tv_s, NULL);
+	t.tv_sec = tv_s.tv_sec + seconds;
+	t.tv_nsec = tv_s.tv_usec * 1000;
 
 	pthread_mutex_lock(&mutex->lock);
 
 	while (!mutex->value && !ret) {
 		mutex->waiters++;
+
+		/*
+		 * Some platforms (FreeBSD 9?) seems to return timed out
+		 * way too early, double check.
+		 */
 		ret = pthread_cond_timedwait(&mutex->cond, &mutex->lock, &t);
+		if (ret == ETIMEDOUT && !mutex_timed_out(&tv_s, seconds)) {
+			pthread_mutex_lock(&mutex->lock);
+			ret = 0;
+		}
+
 		mutex->waiters--;
 	}