Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Wed, 7 Oct 2009 20:02:15 +0000 (22:02 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 7 Oct 2009 20:02:15 +0000 (22:02 +0200)
1  2 
mutex.c

diff --combined mutex.c
index ab7dc7044aa8c8e2f549da7a5e089e9e71322717,9f0f094dc11793feace1975ac880a636999030a7..34b3324ca7d395f49e1579390ba2f60322dd2ba1
+++ b/mutex.c
@@@ -72,7 -72,6 +72,7 @@@ struct fio_mutex *fio_mutex_init(int va
  
        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);
@@@ -95,7 -94,7 +95,7 @@@ int fio_mutex_down_timeout(struct fio_m
        struct timespec t;
        int ret = 0;
  
-       clock_gettime(CLOCK_REALTIME, &t);
+       clock_gettime(CLOCK_MONOTONIC, &t);
        t.tv_sec += seconds;
  
        pthread_mutex_lock(&mutex->lock);