From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 7 Oct 2009 20:02:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
X-Git-Tag: fio-1.34.2~2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9c965f3a2ec2e188606946c2f096a0ec2cc07a5f;hp=-c

Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
---

9c965f3a2ec2e188606946c2f096a0ec2cc07a5f
diff --combined mutex.c
index ab7dc704,9f0f094d..34b3324c
--- a/mutex.c
+++ 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);