void fio_mutex_remove(struct fio_mutex *mutex)
{
+ pthread_cond_destroy(&mutex->cond);
munmap((void *) mutex, sizeof(*mutex));
}
struct fio_mutex *mutex = NULL;
pthread_mutexattr_t attr;
pthread_condattr_t cond;
- int ret, mflag;
+ int ret;
mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
PROT_READ | PROT_WRITE,
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;
}
+
+ /*
+ * Not all platforms support process shared mutexes (FreeBSD)
+ */
#ifdef FIO_HAVE_PSHARED_MUTEX
- ret = pthread_mutexattr_setpshared(&attr, mflag);
+ ret = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
if (ret) {
log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
goto err;
pthread_condattr_init(&cond);
#ifdef FIO_HAVE_PSHARED_MUTEX
- pthread_condattr_setpshared(&cond, mflag);
+ 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);
struct timespec t;
int ret = 0;
+#ifdef FIO_HAVE_CLOCK_MONOTONIC
+ clock_gettime(CLOCK_MONOTONIC, &t);
+#else
clock_gettime(CLOCK_REALTIME, &t);
+#endif
t.tv_sec += seconds;
pthread_mutex_lock(&mutex->lock);