diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | manual/threads.texi | 2 | ||||
| -rw-r--r-- | sysdeps/nptl/pthread.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/hppa/pthread.h | 11 |
4 files changed, 14 insertions, 3 deletions
@@ -35,7 +35,7 @@ Major new features: tz_dsttime fields are zero. * The function pthread_clockjoin_np has been added, enabling join with a - terminated thread with an specific clock. It allows waiting against + terminated thread with a specific clock. It allows waiting against CLOCK_MONOTONIC and CLOCK_REALTIME. This function is a GNU extension. Deprecated and removed features, and other changes affecting compatibility: diff --git a/manual/threads.texi b/manual/threads.texi index e40b55c..0858ef8 100644 --- a/manual/threads.texi +++ b/manual/threads.texi @@ -759,7 +759,7 @@ will wait forever in the same way as @code{pthread_join}. const struct timespec *@var{abstime}) @standards{GNU, pthread.h} @safety{@prelim{}@mtsafe{}@asunsafe{@asulock{}}@acunsafe{@aculock{}}} -Behaves like @code{pthread_timedjoin_np} except that time absolute time in +Behaves like @code{pthread_timedjoin_np} except that the absolute time in @var{abstime} is measured against the clock specified by @var{clockid}. @end deftypefun diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index d2fe6b7..a4ff323 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -272,7 +272,7 @@ extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return, This function is a cancellation point and therefore not marked with __THROW. */ extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return, - clockid_t clockid, + clockid_t __clockid, const struct timespec *__abstime); #endif diff --git a/sysdeps/unix/sysv/linux/hppa/pthread.h b/sysdeps/unix/sysv/linux/hppa/pthread.h index 424135c..300c187 100644 --- a/sysdeps/unix/sysv/linux/hppa/pthread.h +++ b/sysdeps/unix/sysv/linux/hppa/pthread.h @@ -238,6 +238,17 @@ extern int pthread_tryjoin_np (pthread_t __th, void **__thread_return) __THROW; __THROW. */ extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return, const struct timespec *__abstime); + +/* Make calling thread wait for termination of the thread TH, but only + until TIMEOUT measured against the clock specified by CLOCKID. The + exit status of the thread is stored in *THREAD_RETURN, if + THREAD_RETURN is not NULL. + + This function is a cancellation point and therefore not marked with + __THROW. */ +extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return, + clockid_t __clockid, + const struct timespec *__abstime); #endif /* Indicate that the thread TH is never to be joined with PTHREAD_JOIN. |