diff options
| author | Mike Crowe <mac@mcrowe.com> | 2019-11-04 16:36:21 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-11-04 16:44:49 -0300 |
| commit | 3ef5e118f2684bdc3f8e5776269557038705cefb (patch) | |
| tree | a6dcc6cb48efc9f8aaef0b0827a08e0c1f080017 | |
| parent | e4c23a029a54c8c7788eff9ca771a01cccaaa0ce (diff) | |
| download | glibc-3ef5e118f2684bdc3f8e5776269557038705cefb.tar.gz glibc-3ef5e118f2684bdc3f8e5776269557038705cefb.tar.xz glibc-3ef5e118f2684bdc3f8e5776269557038705cefb.zip | |
nptl: Fix niggles with pthread_clockjoin_np
Joseph Myers spotted[1] that 69ca4b54c151cec42ccca5e05790efc1a8206b47 added pthread_clockjoin_np to sysdeps/nptl/pthread.h but not to its hppa-specific equivalent sysdeps/unix/sysv/linux/hppa/pthread.h. Rafal Luzynski spotted[2] typos in the NEWS entry and manual updates too. Florian Weimer spotted[3] that the clockid parameter was not using a reserved identifier in pthread.h. [1] https://sourceware.org/ml/libc-alpha/2019-11/msg00016.html [2] https://sourceware.org/ml/libc-alpha/2019-11/msg00019.html [3] https://sourceware.org/ml/libc-alpha/2019-11/msg00022.html Reviewed-by: Joseph Myers <joseph@codesourcery.com> Reviewed-by: Rafal Luzynski <digitalfreak@lingonborough.com> Reviewed-by: Florian Weimer <fw@deneb.enyo.de>
| -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
diff --git a/NEWS b/NEWS index 3006b1a8e4..2fc1f89771 100644 --- a/NEWS +++ b/NEWS @@ -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 e40b55c090..0858ef8f92 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 d2fe6b7479..a4ff323b76 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 424135c800..300c187759 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. |