fio: make gui capture text ops

[fio.git] / mutex.c

diff --git a/mutex.c b/mutex.c
index cc4e353d1f508e492eae65d052c4af65b9f08d5d..3b94beffc7342ae2f13879126e2da3433cb5bbf1 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -8,6 +8,7 @@
 #include <pthread.h>
 #include <sys/mman.h>
 
+#include "fio.h"
 #include "log.h"
 #include "mutex.h"
 #include "arch/arch.h"
@@ -60,11 +61,6 @@ struct fio_mutex *fio_mutex_init(int value)
        pthread_condattr_init(&cond);
 #ifdef FIO_HAVE_PSHARED_MUTEX
        pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
-#endif
-#ifdef FIO_HAVE_CLOCK_MONOTONIC
-       pthread_condattr_setclock(&cond, CLOCK_MONOTONIC);
-#else
-       pthread_condattr_setclock(&cond, CLOCK_REALTIME);
 #endif
        pthread_cond_init(&mutex->cond, &cond);
 
@@ -96,14 +92,9 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
        struct timespec t;
        int ret = 0;
 
-       fio_gettime(&tv_s, NULL);
-
-#ifdef FIO_HAVE_CLOCK_MONOTONIC
-       clock_gettime(CLOCK_MONOTONIC, &t);
-#else
-       clock_gettime(CLOCK_REALTIME, &t);
-#endif
-       t.tv_sec += seconds;
+       gettimeofday(&tv_s, NULL);
+       t.tv_sec = tv_s.tv_sec + seconds;
+       t.tv_nsec = tv_s.tv_usec * 1000;
 
        pthread_mutex_lock(&mutex->lock);