From 5fd4a9816573a3b6a244b73b84ce0cec871321da Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 7 Mar 2011 17:39:13 -0500 Subject: use the selected clock from the condattr for pthread_cond_timedwait --- src/internal/pthread_impl.h | 1 + src/thread/pthread_cond_init.c | 1 + src/thread/pthread_cond_timedwait.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index 615af708..22ba8b76 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -48,6 +48,7 @@ struct pthread { #define _m_waiters __u.__i[2] #define _m_owner __u.__i[3] #define _c_block __u.__i[0] +#define _c_clock __u.__i[1] #define _rw_wrlock __u.__i[0] #define _rw_readers __u.__i[1] #define _rw_waiters __u.__i[2] diff --git a/src/thread/pthread_cond_init.c b/src/thread/pthread_cond_init.c index 33948606..dc4fb981 100644 --- a/src/thread/pthread_cond_init.c +++ b/src/thread/pthread_cond_init.c @@ -3,5 +3,6 @@ int pthread_cond_init(pthread_cond_t *c, const pthread_condattr_t *a) { memset(c, 0, sizeof *c); + if (a) c->_c_clock = *a & 0x7fffffff; return 0; } diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index b0214b40..228f61f7 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -15,7 +15,7 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t if ((r=pthread_mutex_unlock(m))) return r; CANCELPT(1); - e = __timedwait(&c->_c_block, 1, CLOCK_REALTIME, ts, 0); + e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, 0); CANCELPT(0); pthread_cleanup_pop(0); -- cgit v1.2.1