mutex: add __fio_mutex_remove()

[fio.git] / mutex.c

diff --git a/mutex.c b/mutex.c
index d1e3ceaeff3469be1462ed1af7434f44e8760a72..53f9651a9887538be42addc8db55a5969bd7b974 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -15,39 +15,34 @@
 #include "arch/arch.h"
 #include "os/os.h"
 #include "helpers.h"
-#include "time.h"
+#include "fio_time.h"
 #include "gettime.h"
 
-void fio_mutex_remove(struct fio_mutex *mutex)
+void __fio_mutex_remove(struct fio_mutex *mutex)
 {
        assert(mutex->magic == FIO_MUTEX_MAGIC);
        pthread_cond_destroy(&mutex->cond);
+}
+
+void fio_mutex_remove(struct fio_mutex *mutex)
+{
+       __fio_mutex_remove(mutex);
        munmap((void *) mutex, sizeof(*mutex));
 }
 
-struct fio_mutex *fio_mutex_init(int value)
+int __fio_mutex_init(struct fio_mutex *mutex, int value)
 {
-       struct fio_mutex *mutex = NULL;
        pthread_mutexattr_t attr;
        pthread_condattr_t cond;
        int ret;
 
-       mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
-                               PROT_READ | PROT_WRITE,
-                               OS_MAP_ANON | MAP_SHARED, -1, 0);
-       if (mutex == MAP_FAILED) {
-               perror("mmap mutex");
-               mutex = NULL;
-               goto err;
-       }
-
        mutex->value = value;
        mutex->magic = FIO_MUTEX_MAGIC;
 
        ret = pthread_mutexattr_init(&attr);
        if (ret) {
                log_err("pthread_mutexattr_init: %s\n", strerror(ret));
-               goto err;
+               return ret;
        }
 
        /*
@@ -57,7 +52,7 @@ struct fio_mutex *fio_mutex_init(int value)
        ret = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
        if (ret) {
                log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
-               goto err;
+               return ret;
        }
 #endif
 
@@ -70,17 +65,30 @@ struct fio_mutex *fio_mutex_init(int value)
        ret = pthread_mutex_init(&mutex->lock, &attr);
        if (ret) {
                log_err("pthread_mutex_init: %s\n", strerror(ret));
-               goto err;
+               return ret;
        }
 
        pthread_condattr_destroy(&cond);
        pthread_mutexattr_destroy(&attr);
+       return 0;
+}
 
-       return mutex;
-err:
-       if (mutex)
-               fio_mutex_remove(mutex);
+struct fio_mutex *fio_mutex_init(int value)
+{
+       struct fio_mutex *mutex = NULL;
+
+       mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
+                               PROT_READ | PROT_WRITE,
+                               OS_MAP_ANON | MAP_SHARED, -1, 0);
+       if (mutex == MAP_FAILED) {
+               perror("mmap mutex");
+               return NULL;
+       }
+
+       if (!__fio_mutex_init(mutex, value))
+               return mutex;
 
+       fio_mutex_remove(mutex);
        return NULL;
 }
 
@@ -125,6 +133,22 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
        return ret;
 }
 
+int fio_mutex_down_trylock(struct fio_mutex *mutex)
+{
+       int ret = 1;
+
+       assert(mutex->magic == FIO_MUTEX_MAGIC);
+
+       pthread_mutex_lock(&mutex->lock);
+       if (mutex->value) {
+               mutex->value--;
+               ret = 0;
+       }
+       pthread_mutex_unlock(&mutex->lock);
+
+       return ret;
+}
+
 void fio_mutex_down(struct fio_mutex *mutex)
 {
        assert(mutex->magic == FIO_MUTEX_MAGIC);
@@ -143,14 +167,19 @@ void fio_mutex_down(struct fio_mutex *mutex)
 
 void fio_mutex_up(struct fio_mutex *mutex)
 {
+       int do_wake = 0;
+
        assert(mutex->magic == FIO_MUTEX_MAGIC);
 
        pthread_mutex_lock(&mutex->lock);
        read_barrier();
        if (!mutex->value && mutex->waiters)
-               pthread_cond_signal(&mutex->cond);
+               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)
@@ -205,9 +234,12 @@ struct fio_rwlock *fio_rwlock_init(void)
                log_err("pthread_rwlockattr_setpshared: %s\n", strerror(ret));
                goto destroy_attr;
        }
-#endif
 
        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;