X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=mutex.c;h=e33e7cc8f2611a42256e72a3bceddf9e7560b1ef;hb=0f805c00a7073293f4cceb041a6af0b9f388e6f8;hp=bcc37ae648c0bf440949603d762463a1ea74a7f8;hpb=64d4d313ef4f537408d28fac863cf2a2b0f00175;p=fio.git

diff --git a/mutex.c b/mutex.c
index bcc37ae6..e33e7cc8 100644
--- a/mutex.c
+++ b/mutex.c
@@ -3,15 +3,20 @@
 #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"
+#include "helpers.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 +25,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) {
@@ -28,13 +33,17 @@ struct fio_mutex *fio_mutex_init(int value)
 		return NULL;
 	}
 
+#ifdef FIO_HAVE_FALLOCATE
+	posix_fallocate(fd, 0, sizeof(struct fio_mutex));
+#endif
+
 	if (ftruncate(fd, sizeof(struct fio_mutex)) < 0) {
 		perror("ftruncate mutex");
 		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,24 +55,43 @@ 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");
+#ifdef FIO_HAVE_PSHARED_MUTEX
+	ret = pthread_mutexattr_setpshared(&attr, mflag);
+	if (ret) {
+		log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
 		goto err;
 	}
+#endif
 
 	pthread_condattr_init(&cond);
-	pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
+#ifdef FIO_HAVE_PSHARED_MUTEX
+	pthread_condattr_setpshared(&cond, mflag);
+#endif
 	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;
 	}
 
+	pthread_condattr_destroy(&cond);
+	pthread_mutexattr_destroy(&attr);
+
 	return mutex;
 err:
 	if (mutex)
@@ -73,11 +101,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,7 +142,8 @@ 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);
@@ -94,8 +152,13 @@ void fio_mutex_up(struct fio_mutex *mutex)
 void fio_mutex_down_write(struct fio_mutex *mutex)
 {
 	pthread_mutex_lock(&mutex->lock);
-	while (mutex->value != 0)
+
+	while (mutex->value != 0) {
+		mutex->waiters++;
 		pthread_cond_wait(&mutex->cond, &mutex->lock);
+		mutex->waiters--;
+	}
+
 	mutex->value--;
 	pthread_mutex_unlock(&mutex->lock);
 }
@@ -103,8 +166,13 @@ void fio_mutex_down_write(struct fio_mutex *mutex)
 void fio_mutex_down_read(struct fio_mutex *mutex)
 {
 	pthread_mutex_lock(&mutex->lock);
-	while (mutex->value < 0)
+
+	while (mutex->value < 0) {
+		mutex->waiters++;
 		pthread_cond_wait(&mutex->cond, &mutex->lock);
+		mutex->waiters--;
+	}
+
 	mutex->value++;
 	pthread_mutex_unlock(&mutex->lock);
 }
@@ -113,7 +181,8 @@ void fio_mutex_up_read(struct fio_mutex *mutex)
 {
 	pthread_mutex_lock(&mutex->lock);
 	mutex->value--;
-	if (mutex->value >= 0)
+	read_barrier();
+	if (mutex->value >= 0 && mutex->waiters)
 		pthread_cond_signal(&mutex->cond);
 	pthread_mutex_unlock(&mutex->lock);
 }
@@ -122,7 +191,8 @@ void fio_mutex_up_write(struct fio_mutex *mutex)
 {
 	pthread_mutex_lock(&mutex->lock);
 	mutex->value++;
-	if (mutex->value >= 0)
+	read_barrier();
+	if (mutex->value >= 0 && mutex->waiters)
 		pthread_cond_signal(&mutex->cond);
 	pthread_mutex_unlock(&mutex->lock);
 }