X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=mutex.c;h=1538f62c4b1a286ebe015c299031ffede126e2c4;hp=e6fb3f0d01b96f82dd789de5201362fed3ed9433;hb=2e3e31e36b3565dcc5e36ba3842e7b207799601f;hpb=4d4e80f2b4260f2c8b37a8612ce655502a799f7a

diff --git a/mutex.c b/mutex.c
index e6fb3f0d..1538f62c 100644
--- a/mutex.c
+++ b/mutex.c
@@ -6,13 +6,15 @@
 #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)
 {
 	close(mutex->mutex_fd);
-	munmap(mutex, sizeof(*mutex));
+	munmap((void *) mutex, sizeof(*mutex));
 }
 
 struct fio_mutex *fio_mutex_init(int value)
@@ -21,7 +23,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) {
@@ -34,8 +36,8 @@ struct fio_mutex *fio_mutex_init(int value)
 		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);
@@ -47,21 +49,33 @@ 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");
+	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_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;
 	}