Fix problem with mutexes and MONOTONIC clock

[fio.git] / mutex.c

diff --git a/mutex.c b/mutex.c
index f3c8326663f1d8b350a4b6cc0afd484111682711..ab7dc7044aa8c8e2f549da7a5e089e9e71322717 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -3,15 +3,19 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <time.h>
 #include <pthread.h>
 #include <sys/mman.h>
 
+#include "log.h"
 #include "mutex.h"
+#include "arch/arch.h"
+#include "os/os.h"
 
 void fio_mutex_remove(struct fio_mutex *mutex)
 {
        close(mutex->mutex_fd);
-       munmap(mutex, sizeof(*mutex));
+       munmap((void *) mutex, sizeof(*mutex));
 }
 
 struct fio_mutex *fio_mutex_init(int value)
@@ -20,7 +24,7 @@ struct fio_mutex *fio_mutex_init(int value)
        struct fio_mutex *mutex = NULL;
        pthread_mutexattr_t attr;
        pthread_condattr_t cond;
-       int fd;
+       int fd, ret, mflag;
 
        fd = mkstemp(mutex_name);
        if (fd < 0) {
@@ -33,8 +37,8 @@ struct fio_mutex *fio_mutex_init(int value)
                goto err;
        }
 
-       mutex = mmap(NULL, sizeof(struct fio_mutex), PROT_READ | PROT_WRITE,
-                       MAP_SHARED, fd, 0);
+       mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
+                               PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
        if (mutex == MAP_FAILED) {
                perror("mmap mutex");
                close(fd);
@@ -46,21 +50,34 @@ struct fio_mutex *fio_mutex_init(int value)
        mutex->mutex_fd = fd;
        mutex->value = value;
 
-       if (pthread_mutexattr_init(&attr)) {
-               perror("pthread_mutexattr_init");
+       /*
+        * Not all platforms support process shared mutexes (FreeBSD)
+        */
+#ifdef FIO_HAVE_PSHARED_MUTEX
+       mflag = PTHREAD_PROCESS_SHARED;
+#else
+       mflag = PTHREAD_PROCESS_PRIVATE;
+#endif
+
+       ret = pthread_mutexattr_init(&attr);
+       if (ret) {
+               log_err("pthread_mutexattr_init: %s\n", strerror(ret));
                goto err;
        }
-       if (pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED)) {
-               perror("pthread_mutexattr_setpshared");
+       ret = pthread_mutexattr_setpshared(&attr, mflag);
+       if (ret) {
+               log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
                goto err;
        }
 
        pthread_condattr_init(&cond);
-       pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
+       pthread_condattr_setpshared(&cond, mflag);
+       pthread_condattr_setclock(&cond, CLOCK_MONOTONIC);
        pthread_cond_init(&mutex->cond, &cond);
 
-       if (pthread_mutex_init(&mutex->lock, &attr)) {
-               perror("pthread_mutex_init");
+       ret = pthread_mutex_init(&mutex->lock, &attr);
+       if (ret) {
+               log_err("pthread_mutex_init: %s\n", strerror(ret));
                goto err;
        }
 
@@ -73,11 +90,40 @@ err:
        return NULL;
 }
 
+int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
+{
+       struct timespec t;
+       int ret = 0;
+
+       clock_gettime(CLOCK_REALTIME, &t);
+       t.tv_sec += seconds;
+
+       pthread_mutex_lock(&mutex->lock);
+
+       while (!mutex->value && !ret) {
+               mutex->waiters++;
+               ret = pthread_cond_timedwait(&mutex->cond, &mutex->lock, &t);
+               mutex->waiters--;
+       }
+
+       if (!ret) {
+               mutex->value--;
+               pthread_mutex_unlock(&mutex->lock);
+       }
+
+       return ret;
+}
+
 void fio_mutex_down(struct fio_mutex *mutex)
 {
        pthread_mutex_lock(&mutex->lock);
-       while (mutex->value == 0)
+
+       while (!mutex->value) {
+               mutex->waiters++;
                pthread_cond_wait(&mutex->cond, &mutex->lock);
+               mutex->waiters--;
+       }
+
        mutex->value--;
        pthread_mutex_unlock(&mutex->lock);
 }
@@ -85,8 +131,57 @@ void fio_mutex_down(struct fio_mutex *mutex)
 void fio_mutex_up(struct fio_mutex *mutex)
 {
        pthread_mutex_lock(&mutex->lock);
-       if (!mutex->value)
+       read_barrier();
+       if (!mutex->value && mutex->waiters)
                pthread_cond_signal(&mutex->cond);
        mutex->value++;
        pthread_mutex_unlock(&mutex->lock);
 }
+
+void fio_mutex_down_write(struct fio_mutex *mutex)
+{
+       pthread_mutex_lock(&mutex->lock);
+
+       while (mutex->value != 0) {
+               mutex->waiters++;
+               pthread_cond_wait(&mutex->cond, &mutex->lock);
+               mutex->waiters--;
+       }
+
+       mutex->value--;
+       pthread_mutex_unlock(&mutex->lock);
+}
+
+void fio_mutex_down_read(struct fio_mutex *mutex)
+{
+       pthread_mutex_lock(&mutex->lock);
+
+       while (mutex->value < 0) {
+               mutex->waiters++;
+               pthread_cond_wait(&mutex->cond, &mutex->lock);
+               mutex->waiters--;
+       }
+
+       mutex->value++;
+       pthread_mutex_unlock(&mutex->lock);
+}
+
+void fio_mutex_up_read(struct fio_mutex *mutex)
+{
+       pthread_mutex_lock(&mutex->lock);
+       mutex->value--;
+       read_barrier();
+       if (mutex->value >= 0 && mutex->waiters)
+               pthread_cond_signal(&mutex->cond);
+       pthread_mutex_unlock(&mutex->lock);
+}
+
+void fio_mutex_up_write(struct fio_mutex *mutex)
+{
+       pthread_mutex_lock(&mutex->lock);
+       mutex->value++;
+       read_barrier();
+       if (mutex->value >= 0 && mutex->waiters)
+               pthread_cond_signal(&mutex->cond);
+       pthread_mutex_unlock(&mutex->lock);
+}