nptl: Fix niggles with pthread_clockjoin_np

Joseph Myers spotted[1] that 69ca4b54c1 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>
This commit is contained in:
Mike Crowe 2019-11-04 16:36:21 -03:00 committed by Adhemerval Zanella
parent e4c23a029a
commit 3ef5e118f2
4 changed files with 14 additions and 3 deletions

2
NEWS
View File

@ -35,7 +35,7 @@ Major new features:
tz_dsttime fields are zero. tz_dsttime fields are zero.
* The function pthread_clockjoin_np has been added, enabling join with a * 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. CLOCK_MONOTONIC and CLOCK_REALTIME. This function is a GNU extension.
Deprecated and removed features, and other changes affecting compatibility: Deprecated and removed features, and other changes affecting compatibility:

View File

@ -759,7 +759,7 @@ will wait forever in the same way as @code{pthread_join}.
const struct timespec *@var{abstime}) const struct timespec *@var{abstime})
@standards{GNU, pthread.h} @standards{GNU, pthread.h}
@safety{@prelim{}@mtsafe{}@asunsafe{@asulock{}}@acunsafe{@aculock{}}} @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}. @var{abstime} is measured against the clock specified by @var{clockid}.
@end deftypefun @end deftypefun

View File

@ -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 This function is a cancellation point and therefore not marked with
__THROW. */ __THROW. */
extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return, extern int pthread_clockjoin_np (pthread_t __th, void **__thread_return,
clockid_t clockid, clockid_t __clockid,
const struct timespec *__abstime); const struct timespec *__abstime);
#endif #endif

View File

@ -238,6 +238,17 @@ extern int pthread_tryjoin_np (pthread_t __th, void **__thread_return) __THROW;
__THROW. */ __THROW. */
extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return, extern int pthread_timedjoin_np (pthread_t __th, void **__thread_return,
const struct timespec *__abstime); 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 #endif
/* Indicate that the thread TH is never to be joined with PTHREAD_JOIN. /* Indicate that the thread TH is never to be joined with PTHREAD_JOIN.