X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=mutex.c;h=abe073f4ffdf7d49ee92500db8d89e254def2852;hb=aa58d2520204f5ae12291fae0289a90fb03dc587;hp=5beaa08f0b921868d36598a6030c23867495cf42;hpb=f356d01d0cf8fec2ee58f66a9b5c00c93defbc47;p=fio.git

diff --git a/mutex.c b/mutex.c
index 5beaa08f..abe073f4 100644
--- a/mutex.c
+++ b/mutex.c
@@ -3,12 +3,15 @@
 #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)
 {
@@ -62,14 +65,18 @@ struct fio_mutex *fio_mutex_init(int value)
 		log_err("pthread_mutexattr_init: %s\n", strerror(ret));
 		goto err;
 	}
+#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);
+#ifdef FIO_HAVE_PSHARED_MUTEX
 	pthread_condattr_setpshared(&cond, mflag);
+#endif
 	pthread_cond_init(&mutex->cond, &cond);
 
 	ret = pthread_mutex_init(&mutex->lock, &attr);
@@ -87,6 +94,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_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);