Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/libpthread

6 files changed, 31 insertions, 9 deletions

diff --git a/sysdeps/generic/pt-cond-timedwait.c b/sysdeps/generic/pt-cond-timedwait.c
index 483f277..56eb1ec 100644
--- a/sysdeps/generic/pt-cond-timedwait.c
+++ b/sysdeps/generic/pt-cond-timedwait.c
@@ -46,6 +46,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond,
 {
   error_t err;
   int canceltype;
+  clockid_t clock_id = __pthread_default_condattr.clock;
 
   void cleanup (void *arg)
     {
@@ -68,6 +69,8 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond,
   /* Add ourselves to the list of waiters.  */
   __pthread_spin_lock (&cond->__lock);
   __pthread_enqueue (&cond->__queue, self);
+  if (cond->__attr)
+    clock_id = cond->__attr->clock;
   __pthread_spin_unlock (&cond->__lock);
 
   __pthread_mutex_unlock (mutex);
@@ -79,7 +82,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond,
 
   if (abstime)
     {
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, clock_id);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/pt-condattr-setclock.c b/sysdeps/generic/pt-condattr-setclock.c
index 984c17e..c5a78ef 100644
--- a/sysdeps/generic/pt-condattr-setclock.c
+++ b/sysdeps/generic/pt-condattr-setclock.c
@@ -23,11 +23,30 @@
 int
 pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock)
 {
-  if (__pthread_default_condattr.clock == clock)
+  /* Only a few clocks are allowed.  CLOCK_REALTIME is always allowed.
+     CLOCK_MONOTONIC only if the kernel has the necessary support.  */
+  if (clock == CLOCK_MONOTONIC)
     {
-      attr->clock = clock;
-      return 0;
+      /* Check whether the clock is available.  */
+      static int avail;
+
+      if (avail == 0)
+	{
+	  struct timespec ts;
+	  int res;
+
+	  res = clock_getres (CLOCK_MONOTONIC, &ts);
+	  avail = res < 0 ? -1 : 1;
+	}
+
+      if (avail < 0)
+	/* Not available.  */
+	return EINVAL;
     }
+  else if (clock != CLOCK_REALTIME)
+    return EINVAL;
+
+  attr->clock = clock;
 
-  return EINVAL;
+  return 0;
 }
diff --git a/sysdeps/generic/pt-mutex-timedlock.c b/sysdeps/generic/pt-mutex-timedlock.c
index 883e50a..48bffaf 100644
--- a/sysdeps/generic/pt-mutex-timedlock.c
+++ b/sysdeps/generic/pt-mutex-timedlock.c
@@ -130,7 +130,7 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/pt-rwlock-timedrdlock.c b/sysdeps/generic/pt-rwlock-timedrdlock.c
index ba610fa..a110213 100644
--- a/sysdeps/generic/pt-rwlock-timedrdlock.c
+++ b/sysdeps/generic/pt-rwlock-timedrdlock.c
@@ -73,7 +73,7 @@ __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock *rwlock,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/pt-rwlock-timedwrlock.c b/sysdeps/generic/pt-rwlock-timedwrlock.c
index 04eab51..a5cc579 100644
--- a/sysdeps/generic/pt-rwlock-timedwrlock.c
+++ b/sysdeps/generic/pt-rwlock-timedwrlock.c
@@ -59,7 +59,7 @@ __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock *rwlock,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, abstime);
+      err = __pthread_timedblock (self, abstime, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.
diff --git a/sysdeps/generic/sem-timedwait.c b/sysdeps/generic/sem-timedwait.c
index e34539a..94e6dee 100644
--- a/sysdeps/generic/sem-timedwait.c
+++ b/sysdeps/generic/sem-timedwait.c
@@ -55,7 +55,7 @@ __sem_timedwait_internal (sem_t *restrict sem,
     {
       error_t err;
 
-      err = __pthread_timedblock (self, timeout);
+      err = __pthread_timedblock (self, timeout, CLOCK_REALTIME);
       if (err)
 	/* We timed out.  We may need to disconnect ourself from the
 	   waiter queue.