X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=mutex.c;h=34b3324ca7d395f49e1579390ba2f60322dd2ba1;hp=0f13064af8f26929d3aeac09a22de8331d0e9fa3;hb=9c965f3a2ec2e188606946c2f096a0ec2cc07a5f;hpb=42124d37bd92d865b0c27751c520f671c2a91101

diff --git a/mutex.c b/mutex.c
index 0f13064a..34b3324c 100644
--- a/mutex.c
+++ b/mutex.c
@@ -3,11 +3,14 @@
 #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)
 {
@@ -21,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) {
@@ -47,21 +50,34 @@ struct fio_mutex *fio_mutex_init(int value)
 	mutex->mutex_fd = fd;
 	mutex->value = value;
 
-	if (pthread_mutexattr_init(&attr) < 0) {
-		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) < 0) {
-		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) < 0) {
-		perror("pthread_mutex_init");
+	ret = pthread_mutex_init(&mutex->lock, &attr);
+	if (ret) {
+		log_err("pthread_mutex_init: %s\n", strerror(ret));
 		goto err;
 	}
 
@@ -74,6 +90,30 @@ err:
 	return NULL;
 }
 
+int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
+{
+	struct timespec t;
+	int ret = 0;
+
+	clock_gettime(CLOCK_MONOTONIC, &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);