Optimize pthread_cond_timedwait to avoid unnecessary call to clock_gettime for CLOCK_...

[thirdparty/glibc.git] / nptl / pthread_cond_wait.c

diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c
index 3e1105418210288ef21c37730a59dc8bc619ab3b..0dbab42148ed3466698d5d6dfec28cdb16a791eb 100644 (file)
--- a/nptl/pthread_cond_wait.c
+++ b/nptl/pthread_cond_wait.c
@@ -510,34 +510,13 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex,
              if (__glibc_unlikely (abstime->tv_sec < 0))
                err = ETIMEDOUT;
 
-             else if ((flags & __PTHREAD_COND_CLOCK_MONOTONIC_MASK) != 0)
-               {
-                 /* CLOCK_MONOTONIC is requested.  */
-                 struct timespec rt;
-                 if (__clock_gettime (CLOCK_MONOTONIC, &rt) != 0)
-                   __libc_fatal ("clock_gettime does not support "
-                                 "CLOCK_MONOTONIC");
-                 /* Convert the absolute timeout value to a relative
-                    timeout.  */
-                 rt.tv_sec = abstime->tv_sec - rt.tv_sec;
-                 rt.tv_nsec = abstime->tv_nsec - rt.tv_nsec;
-                 if (rt.tv_nsec < 0)
-                   {
-                     rt.tv_nsec += 1000000000;
-                     --rt.tv_sec;
-                   }
-                 /* Did we already time out?  */
-                 if (__glibc_unlikely (rt.tv_sec < 0))
-                   err = ETIMEDOUT;
-                 else
-                   err = futex_reltimed_wait_cancelable
-                       (cond->__data.__g_signals + g, 0, &rt, private);
-               }
              else
                {
-                 /* Use CLOCK_REALTIME.  */
                  err = futex_abstimed_wait_cancelable
-                     (cond->__data.__g_signals + g, 0, abstime, private);
+                     (cond->__data.__g_signals + g, 0, abstime,
+                     (flags & __PTHREAD_COND_CLOCK_MONOTONIC_MASK) != 0
+                        ? 0
+                        : FUTEX_CLOCK_REALTIME, private);
                }
            }