X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=mutex.c;h=e1fbb607f1a416fb06a25a611f0f4233c9814357;hp=6b4c9fe187bcdb0f080af0a14ae29e7615695e83;hb=26b26fca811da908e967825ce483b57b57881d8e;hpb=ceab2ea2745270254c01ca2bd0195144bd79e607

diff --git a/mutex.c b/mutex.c
index 6b4c9fe1..e1fbb607 100644
--- a/mutex.c
+++ b/mutex.c
@@ -4,17 +4,24 @@
 #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 "os/os.h"
 #include "helpers.h"
+#include "time.h"
+#include "gettime.h"
 
 void fio_mutex_remove(struct fio_mutex *mutex)
 {
+	assert(mutex->magic == FIO_MUTEX_MAGIC);
+	pthread_cond_destroy(&mutex->cond);
 	munmap((void *) mutex, sizeof(*mutex));
 }
 
@@ -35,6 +42,7 @@ struct fio_mutex *fio_mutex_init(int value)
 	}
 
 	mutex->value = value;
+	mutex->magic = FIO_MUTEX_MAGIC;
 
 	ret = pthread_mutexattr_init(&attr);
 	if (ret) {
@@ -58,11 +66,6 @@ struct fio_mutex *fio_mutex_init(int value)
 	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
 
 	ret = pthread_mutex_init(&mutex->lock, &attr);
 	if (ret) {
@@ -81,23 +84,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;
+	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;
 
 	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))
+			ret = 0;
+
 		mutex->waiters--;
 	}
 
@@ -111,6 +127,8 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
 
 void fio_mutex_down(struct fio_mutex *mutex)
 {
+	assert(mutex->magic == FIO_MUTEX_MAGIC);
+
 	pthread_mutex_lock(&mutex->lock);
 
 	while (!mutex->value) {
@@ -125,6 +143,8 @@ void fio_mutex_down(struct fio_mutex *mutex)
 
 void fio_mutex_up(struct fio_mutex *mutex)
 {
+	assert(mutex->magic == FIO_MUTEX_MAGIC);
+
 	pthread_mutex_lock(&mutex->lock);
 	read_barrier();
 	if (!mutex->value && mutex->waiters)
@@ -133,50 +153,76 @@ void fio_mutex_up(struct fio_mutex *mutex)
 	pthread_mutex_unlock(&mutex->lock);
 }
 
-void fio_mutex_down_write(struct fio_mutex *mutex)
+void fio_rwlock_write(struct fio_rwlock *lock)
 {
-	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);
+	assert(lock->magic == FIO_RWLOCK_MAGIC);
+	pthread_rwlock_wrlock(&lock->lock);
 }
 
-void fio_mutex_down_read(struct fio_mutex *mutex)
+void fio_rwlock_read(struct fio_rwlock *lock)
 {
-	pthread_mutex_lock(&mutex->lock);
-
-	while (mutex->value < 0) {
-		mutex->waiters++;
-		pthread_cond_wait(&mutex->cond, &mutex->lock);
-		mutex->waiters--;
-	}
+	assert(lock->magic == FIO_RWLOCK_MAGIC);
+	pthread_rwlock_rdlock(&lock->lock);
+}
 
-	mutex->value++;
-	pthread_mutex_unlock(&mutex->lock);
+void fio_rwlock_unlock(struct fio_rwlock *lock)
+{
+	assert(lock->magic == FIO_RWLOCK_MAGIC);
+	pthread_rwlock_unlock(&lock->lock);
 }
 
-void fio_mutex_up_read(struct fio_mutex *mutex)
+void fio_rwlock_remove(struct fio_rwlock *lock)
 {
-	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);
+	assert(lock->magic == FIO_RWLOCK_MAGIC);
+	munmap((void *) lock, sizeof(*lock));
 }
 
-void fio_mutex_up_write(struct fio_mutex *mutex)
+struct fio_rwlock *fio_rwlock_init(void)
 {
-	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);
+	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;
 }