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

diff --git a/mutex.c b/mutex.c
index 5beaa08f..34b3324c 100644
--- a/mutex.c
+++ b/mutex.c
@@ -3,12 +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)
 {
@@ -70,6 +72,7 @@ struct fio_mutex *fio_mutex_init(int value)
 
 	pthread_condattr_init(&cond);
 	pthread_condattr_setpshared(&cond, mflag);
+	pthread_condattr_setclock(&cond, CLOCK_MONOTONIC);
 	pthread_cond_init(&mutex->cond, &cond);
 
 	ret = pthread_mutex_init(&mutex->lock, &attr);
@@ -87,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);