Only use process shared mutexes on support platforms

On FreeBSD, suggest the use of threads instead.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/init.c b/init.c
index a8acdc04b4e1be49fc080be3f0a9a17e09281cef..3142d8ca7a8dd9c32e606ea6bc2c7d49843f8b15 100644 (file)
--- a/init.c
+++ b/init.c
@@ -214,6 +214,15 @@ static int fixup_options(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
 
+#ifndef FIO_HAVE_PSHARED_MUTEX
+       if (!td->o.use_thread) {
+               log_info("fio: this platform does not support process shared"
+                        " mutexes, forcing use of threads. Use the 'thread'"
+                        " option to get rid of this warning.\n");
+               td->o.use_thread = 1;
+       }
+#endif
+
 #ifndef FIO_HAVE_CPU_AFFINITY
        if (td->o.gtod_cpu) {
                log_err("fio: platform must support CPU affinity for"

diff --git a/mutex.c b/mutex.c
index 7d072186686d21779280cf28fe10d8ed867f5e63..5beaa08f0b921868d36598a6030c23867495cf42 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -22,7 +22,7 @@ struct fio_mutex *fio_mutex_init(int value)
        struct fio_mutex *mutex = NULL;
        pthread_mutexattr_t attr;
        pthread_condattr_t cond;
-       int fd, ret;
+       int fd, ret, mflag;
 
        fd = mkstemp(mutex_name);
        if (fd < 0) {
@@ -48,19 +48,28 @@ struct fio_mutex *fio_mutex_init(int value)
        mutex->mutex_fd = fd;
        mutex->value = value;
 
+       /*
+        * 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;
        }
-       ret = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
+       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);
 
        ret = pthread_mutex_init(&mutex->lock, &attr);

diff --git a/os/os-linux.h b/os/os-linux.h
index 03d2450cf5f9388199ec227743eb9172807d71c9..a2a9b249305863e0ba45cd0b96d4f1d6cdd39085 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -28,6 +28,7 @@
 #define FIO_HAVE_STRSEP
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
+#define FIO_HAVE_PSHARED_MUTEX
 
 #define OS_MAP_ANON            MAP_ANONYMOUS
 

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 51c0ff4bc06a0c4851d5cf67c5a5ecb4ffd60b25..35148d2dfcec7bf6aff5de95af36a30357842b84 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -10,6 +10,7 @@
 #define FIO_HAVE_FALLOCATE
 #define FIO_HAVE_POSIXAIO_FSYNC
 #define FIO_HAVE_CPU_AFFINITY
+#define FIO_HAVE_PSHARED_MUTEX
 
 #define OS_MAP_ANON            MAP_ANON
 #define OS_RAND_MAX            2147483648UL