lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

y2038: nptl: Convert pthread_{clock|timed}join_np to support 64 bit time

Browse Source 
The pthread_clockjoin_np and pthread_timedjoin_np have been converted to
support 64 bit time.

This change introduces new futex_timed_wait_cancel64 function in
./sysdeps/nptl/futex-internal.h, which uses futex_time64 where possible
and tries to replace low-level preprocessor macros from
lowlevellock-futex.h
The pthread_{timed|clock}join_np only accept absolute time. Moreover,
there is no need to check for NULL passed as *abstime pointer as
clockwait_tid() always passes struct __timespec64.

For systems with __TIMESIZE != 64 && __WORDSIZE == 32:
- Conversions between 64 bit time to 32 bit are necessary
- Redirection to __pthread_{clock|timed}join_np64 will provide support
  for 64 bit time

Build tests:
./src/scripts/build-many-glibcs.py glibcs

Run-time tests:
- Run specific tests on ARM/x86 32bit systems (qemu):
  https://github.com/lmajewski/meta-y2038 and run tests:
  https://github.com/lmajewski/y2038-tests/commits/master

Above tests were performed with Y2038 redirection applied as well as without
to test the proper usage of both __pthread_{timed|clock}join_np64 and
__pthread_{timed|clock}join_np.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Lukasz Majewski
2020-07-20 15:50:12 +02:00
parent 12b2fd0ef9
commit 4a14cb87ca
5 changed files with 110 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nptl/pthread_join_common.c
View File

@ -20,6 +20,7 @@
#include <atomic.h>
#include <stap-probe.h>
#include <time.h>
#include <futex-internal.h>
static void
cleanup (void *arg)
@ -37,9 +38,11 @@ cleanup (void *arg)
afterwards. The kernel up to version 3.16.3 does not use the private futex
operations for futex wake-up when the clone terminates. */
static int
clockwait_tid (pid_t *tidp, clockid_t clockid, const struct timespec *abstime)
clockwait_tid (pid_t *tidp, clockid_t clockid,
const struct __timespec64 *abstime)
{
pid_t tid;
int ret;
if (! valid_nanoseconds (abstime->tv_nsec))
return EINVAL;
@ -47,11 +50,11 @@ clockwait_tid (pid_t *tidp, clockid_t clockid, const struct timespec *abstime)
/* Repeat until thread terminated. */
while ((tid = *tidp) != 0)
{
struct timespec rt;
struct __timespec64 rt;
/* Get the current time. This can only fail if clockid is
invalid. */
if (__glibc_unlikely (__clock_gettime (clockid, &rt)))
if (__glibc_unlikely (__clock_gettime64 (clockid, &rt)))
return EINVAL;
/* Compute relative timeout. */
@ -70,9 +73,9 @@ clockwait_tid (pid_t *tidp, clockid_t clockid, const struct timespec *abstime)
/* If *tidp == tid, wait until thread terminates or the wait times out.
The kernel up to version 3.16.3 does not use the private futex
operations for futex wake-up when the clone terminates. */
if (lll_futex_timed_wait_cancel (tidp, tid, &rt, LLL_SHARED)
== -ETIMEDOUT)
return ETIMEDOUT;
ret = futex_timed_wait_cancel64 (tidp, tid, &rt, LLL_SHARED);
if (ret == -ETIMEDOUT || ret == -EOVERFLOW)
return -ret;
}
return 0;
@ -80,8 +83,8 @@ clockwait_tid (pid_t *tidp, clockid_t clockid, const struct timespec *abstime)
int
__pthread_clockjoin_ex (pthread_t threadid, void **thread_return,
clockid_t clockid,
const struct timespec *abstime, bool block)
clockid_t clockid,
const struct __timespec64 *abstime, bool block)
{
struct pthread *pd = (struct pthread *) threadid;