Mutex fixes

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/mutex.c b/mutex.c
index 6b4c9fe187bcdb0f080af0a14ae29e7615695e83..24defcf515ef4d793b250a60b7e52d1386ba1bab 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -15,6 +15,7 @@
 
 void fio_mutex_remove(struct fio_mutex *mutex)
 {
 
 void fio_mutex_remove(struct fio_mutex *mutex)
 {

+       pthread_cond_destroy(&mutex->cond);

        munmap((void *) mutex, sizeof(*mutex));
 }
 
        munmap((void *) mutex, sizeof(*mutex));
 }
 


@@ -57,12 +58,12 @@ struct fio_mutex *fio_mutex_init(int value)
 #ifdef FIO_HAVE_PSHARED_MUTEX
        pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
 #endif
 #ifdef FIO_HAVE_PSHARED_MUTEX
        pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);
 #endif

-       pthread_cond_init(&mutex->cond, &cond);

 #ifdef FIO_HAVE_CLOCK_MONOTONIC
        pthread_condattr_setclock(&cond, CLOCK_MONOTONIC);
 #else
        pthread_condattr_setclock(&cond, CLOCK_REALTIME);
 #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);

 
        ret = pthread_mutex_init(&mutex->lock, &attr);
        if (ret) {
 
        ret = pthread_mutex_init(&mutex->lock, &attr);
        if (ret) {