use the selected clock from the condattr for pthread_cond_timedwait

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 615af7083325f57f2ab16762fc9d474dc12385ce..22ba8b76fedc69ae947140bdea490d19a569a3e7 100644 (file)
--- 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 339486066657236a08e06bb8ab43d1bd7fce0f37..dc4fb98167631257e58224055041937b244e7f3a 100644 (file)
--- 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 b0214b40a88068375d4011ebe6d604e2d81985a0..228f61f706e4cf03e9bea6ad735db685ce371b34 100644 (file)
--- 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);