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

diff --git a/mutex.c b/mutex.c
index 34b3324c..e33e7cc8 100644
--- a/mutex.c
+++ b/mutex.c
@@ -11,6 +11,7 @@
 #include "mutex.h"
 #include "arch/arch.h"
 #include "os/os.h"
+#include "helpers.h"
 
 void fio_mutex_remove(struct fio_mutex *mutex)
 {
@@ -32,6 +33,10 @@ struct fio_mutex *fio_mutex_init(int value)
 		return NULL;
 	}
 
+#ifdef FIO_HAVE_FALLOCATE
+	posix_fallocate(fd, 0, sizeof(struct fio_mutex));
+#endif
+
 	if (ftruncate(fd, sizeof(struct fio_mutex)) < 0) {
 		perror("ftruncate mutex");
 		goto err;
@@ -64,15 +69,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);
-	pthread_condattr_setclock(&cond, CLOCK_MONOTONIC);
+#endif
 	pthread_cond_init(&mutex->cond, &cond);
 
 	ret = pthread_mutex_init(&mutex->lock, &attr);
@@ -81,6 +89,9 @@ struct fio_mutex *fio_mutex_init(int value)
 		goto err;
 	}
 
+	pthread_condattr_destroy(&cond);
+	pthread_mutexattr_destroy(&attr);
+
 	return mutex;
 err:
 	if (mutex)
@@ -95,7 +106,7 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
 	struct timespec t;
 	int ret = 0;
 
-	clock_gettime(CLOCK_MONOTONIC, &t);
+	clock_gettime(CLOCK_REALTIME, &t);
 	t.tv_sec += seconds;
 
 	pthread_mutex_lock(&mutex->lock);