Mutex timeout work-around

[fio.git] / mutex.c

diff --git a/mutex.c b/mutex.c
index 6b4c9fe187bcdb0f080af0a14ae29e7615695e83..cc4e353d1f508e492eae65d052c4af65b9f08d5d 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <time.h>
+#include <errno.h>
 #include <pthread.h>
 #include <sys/mman.h>
 
@@ -12,9 +13,12 @@
 #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)
 {
+       pthread_cond_destroy(&mutex->cond);
        munmap((void *) mutex, sizeof(*mutex));
 }
 
@@ -57,12 +61,12 @@ struct fio_mutex *fio_mutex_init(int value)
 #ifdef FIO_HAVE_PSHARED_MUTEX
        pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
 #endif
-       pthread_cond_init(&mutex->cond, &cond);
 #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);
 
        ret = pthread_mutex_init(&mutex->lock, &attr);
        if (ret) {
@@ -81,11 +85,19 @@ 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;
 
+       fio_gettime(&tv_s, NULL);
+
 #ifdef FIO_HAVE_CLOCK_MONOTONIC
        clock_gettime(CLOCK_MONOTONIC, &t);
 #else
@@ -97,7 +109,17 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
 
        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--;
        }