Split mutex.c and .h each into three files
[fio.git] / mutex.c
diff --git a/mutex.c b/mutex.c
index 7612b32ba26d89e06f55116f0dc236fef5ebfe70..03291c7faf9392a62d373ea0cc5e55763fbba728 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -1,20 +1,11 @@
-#include <stdio.h>
 #include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <time.h>
-#include <errno.h>
-#include <pthread.h>
 #include <sys/mman.h>
 #include <assert.h>
 
-#include "fio.h"
 #include "log.h"
 #include "mutex.h"
-#include "arch/arch.h"
+#include "pshared.h"
 #include "os/os.h"
-#include "helpers.h"
 #include "fio_time.h"
 #include "gettime.h"
 
@@ -22,6 +13,12 @@ void __fio_mutex_remove(struct fio_mutex *mutex)
 {
        assert(mutex->magic == FIO_MUTEX_MAGIC);
        pthread_cond_destroy(&mutex->cond);
+
+       /*
+        * Ensure any subsequent attempt to grab this mutex will fail
+        * with an assert, instead of just silently hanging.
+        */
+       memset(mutex, 0, sizeof(*mutex));
 }
 
 void fio_mutex_remove(struct fio_mutex *mutex)
@@ -32,44 +29,15 @@ void fio_mutex_remove(struct fio_mutex *mutex)
 
 int __fio_mutex_init(struct fio_mutex *mutex, int value)
 {
-       pthread_mutexattr_t attr;
-       pthread_condattr_t cond;
        int ret;
 
        mutex->value = value;
        mutex->magic = FIO_MUTEX_MAGIC;
 
-       ret = pthread_mutexattr_init(&attr);
-       if (ret) {
-               log_err("pthread_mutexattr_init: %s\n", strerror(ret));
+       ret = mutex_cond_init_pshared(&mutex->lock, &mutex->cond);
+       if (ret)
                return ret;
-       }
-
-       /*
-        * Not all platforms support process shared mutexes (FreeBSD)
-        */
-#ifdef FIO_HAVE_PSHARED_MUTEX
-       ret = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
-       if (ret) {
-               log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
-               return ret;
-       }
-#endif
-
-       pthread_condattr_init(&cond);
-#ifdef FIO_HAVE_PSHARED_MUTEX
-       pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
-#endif
-       pthread_cond_init(&mutex->cond, &cond);
-
-       ret = pthread_mutex_init(&mutex->lock, &attr);
-       if (ret) {
-               log_err("pthread_mutex_init: %s\n", strerror(ret));
-               return ret;
-       }
 
-       pthread_condattr_destroy(&cond);
-       pthread_mutexattr_destroy(&attr);
        return 0;
 }
 
@@ -92,44 +60,59 @@ struct fio_mutex *fio_mutex_init(int value)
        return NULL;
 }
 
-static bool mutex_timed_out(struct timeval *t, unsigned int seconds)
+static bool mutex_timed_out(struct timespec *t, unsigned int msecs)
 {
-       return mtime_since_now(t) >= seconds * 1000;
+       struct timeval tv;
+       struct timespec now;
+
+       gettimeofday(&tv, NULL);
+       now.tv_sec = tv.tv_sec;
+       now.tv_nsec = tv.tv_usec * 1000;
+
+       return mtime_since(t, &now) >= msecs;
 }
 
-int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
+int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int msecs)
 {
        struct timeval tv_s;
+       struct timespec base;
        struct timespec t;
        int ret = 0;
 
        assert(mutex->magic == FIO_MUTEX_MAGIC);
 
        gettimeofday(&tv_s, NULL);
-       t.tv_sec = tv_s.tv_sec + seconds;
-       t.tv_nsec = tv_s.tv_usec * 1000;
+       base.tv_sec = t.tv_sec = tv_s.tv_sec;
+       base.tv_nsec = t.tv_nsec = tv_s.tv_usec * 1000;
+
+       t.tv_sec += msecs / 1000;
+       t.tv_nsec += ((msecs * 1000000ULL) % 1000000000);
+       if (t.tv_nsec >= 1000000000) {
+               t.tv_nsec -= 1000000000;
+               t.tv_sec++;
+       }
 
        pthread_mutex_lock(&mutex->lock);
 
+       mutex->waiters++;
        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))
+               if (ret == ETIMEDOUT && !mutex_timed_out(&base, msecs))
                        ret = 0;
-
-               mutex->waiters--;
        }
+       mutex->waiters--;
 
        if (!ret) {
                mutex->value--;
                pthread_mutex_unlock(&mutex->lock);
+               return 0;
        }
 
+       pthread_mutex_unlock(&mutex->lock);
        return ret;
 }
 
@@ -176,82 +159,9 @@ void fio_mutex_up(struct fio_mutex *mutex)
        if (!mutex->value && mutex->waiters)
                do_wake = 1;
        mutex->value++;
-       pthread_mutex_unlock(&mutex->lock);
 
        if (do_wake)
                pthread_cond_signal(&mutex->cond);
-}
-
-void fio_rwlock_write(struct fio_rwlock *lock)
-{
-       assert(lock->magic == FIO_RWLOCK_MAGIC);
-       pthread_rwlock_wrlock(&lock->lock);
-}
 
-void fio_rwlock_read(struct fio_rwlock *lock)
-{
-       assert(lock->magic == FIO_RWLOCK_MAGIC);
-       pthread_rwlock_rdlock(&lock->lock);
-}
-
-void fio_rwlock_unlock(struct fio_rwlock *lock)
-{
-       assert(lock->magic == FIO_RWLOCK_MAGIC);
-       pthread_rwlock_unlock(&lock->lock);
-}
-
-void fio_rwlock_remove(struct fio_rwlock *lock)
-{
-       assert(lock->magic == FIO_RWLOCK_MAGIC);
-       munmap((void *) lock, sizeof(*lock));
-}
-
-struct fio_rwlock *fio_rwlock_init(void)
-{
-       struct fio_rwlock *lock;
-       pthread_rwlockattr_t attr;
-       int ret;
-
-       lock = (void *) mmap(NULL, sizeof(struct fio_rwlock),
-                               PROT_READ | PROT_WRITE,
-                               OS_MAP_ANON | MAP_SHARED, -1, 0);
-       if (lock == MAP_FAILED) {
-               perror("mmap rwlock");
-               lock = NULL;
-               goto err;
-       }
-
-       lock->magic = FIO_RWLOCK_MAGIC;
-
-       ret = pthread_rwlockattr_init(&attr);
-       if (ret) {
-               log_err("pthread_rwlockattr_init: %s\n", strerror(ret));
-               goto err;
-       }
-#ifdef FIO_HAVE_PSHARED_MUTEX
-       ret = pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
-       if (ret) {
-               log_err("pthread_rwlockattr_setpshared: %s\n", strerror(ret));
-               goto destroy_attr;
-       }
-
-       ret = pthread_rwlock_init(&lock->lock, &attr);
-#else
-       ret = pthread_rwlock_init(&lock->lock, NULL);
-#endif
-
-       if (ret) {
-               log_err("pthread_rwlock_init: %s\n", strerror(ret));
-               goto destroy_attr;
-       }
-
-       pthread_rwlockattr_destroy(&attr);
-
-       return lock;
-destroy_attr:
-       pthread_rwlockattr_destroy(&attr);
-err:
-       if (lock)
-               fio_rwlock_remove(lock);
-       return NULL;
+       pthread_mutex_unlock(&mutex->lock);
 }