mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
4a14cb87ca
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>
174 lines
5.6 KiB
C
174 lines
5.6 KiB
C
/* Common definition for pthread_{timed,try}join{_np}.
|
|
Copyright (C) 2017-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include "pthreadP.h"
|
|
#include <atomic.h>
|
|
#include <stap-probe.h>
|
|
#include <time.h>
|
|
#include <futex-internal.h>
|
|
|
|
static void
|
|
cleanup (void *arg)
|
|
{
|
|
/* If we already changed the waiter ID, reset it. The call cannot
|
|
fail for any reason but the thread not having done that yet so
|
|
there is no reason for a loop. */
|
|
struct pthread *self = THREAD_SELF;
|
|
atomic_compare_exchange_weak_acquire (&arg, &self, NULL);
|
|
}
|
|
|
|
/* The kernel notifies a process which uses CLONE_CHILD_CLEARTID via futex
|
|
wake-up when the clone terminates. The memory location contains the
|
|
thread ID while the clone is running and is reset to zero by the kernel
|
|
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 __timespec64 *abstime)
|
|
{
|
|
pid_t tid;
|
|
int ret;
|
|
|
|
if (! valid_nanoseconds (abstime->tv_nsec))
|
|
return EINVAL;
|
|
|
|
/* Repeat until thread terminated. */
|
|
while ((tid = *tidp) != 0)
|
|
{
|
|
struct __timespec64 rt;
|
|
|
|
/* Get the current time. This can only fail if clockid is
|
|
invalid. */
|
|
if (__glibc_unlikely (__clock_gettime64 (clockid, &rt)))
|
|
return EINVAL;
|
|
|
|
/* Compute 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;
|
|
}
|
|
|
|
/* Already timed out? */
|
|
if (rt.tv_sec < 0)
|
|
return ETIMEDOUT;
|
|
|
|
/* 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. */
|
|
ret = futex_timed_wait_cancel64 (tidp, tid, &rt, LLL_SHARED);
|
|
if (ret == -ETIMEDOUT || ret == -EOVERFLOW)
|
|
return -ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
__pthread_clockjoin_ex (pthread_t threadid, void **thread_return,
|
|
clockid_t clockid,
|
|
const struct __timespec64 *abstime, bool block)
|
|
{
|
|
struct pthread *pd = (struct pthread *) threadid;
|
|
|
|
/* Make sure the descriptor is valid. */
|
|
if (INVALID_NOT_TERMINATED_TD_P (pd))
|
|
/* Not a valid thread handle. */
|
|
return ESRCH;
|
|
|
|
/* Is the thread joinable?. */
|
|
if (IS_DETACHED (pd))
|
|
/* We cannot wait for the thread. */
|
|
return EINVAL;
|
|
|
|
struct pthread *self = THREAD_SELF;
|
|
int result = 0;
|
|
|
|
LIBC_PROBE (pthread_join, 1, threadid);
|
|
|
|
if ((pd == self
|
|
|| (self->joinid == pd
|
|
&& (pd->cancelhandling
|
|
& (CANCELING_BITMASK | CANCELED_BITMASK | EXITING_BITMASK
|
|
| TERMINATED_BITMASK)) == 0))
|
|
&& !CANCEL_ENABLED_AND_CANCELED (self->cancelhandling))
|
|
/* This is a deadlock situation. The threads are waiting for each
|
|
other to finish. Note that this is a "may" error. To be 100%
|
|
sure we catch this error we would have to lock the data
|
|
structures but it is not necessary. In the unlikely case that
|
|
two threads are really caught in this situation they will
|
|
deadlock. It is the programmer's problem to figure this
|
|
out. */
|
|
return EDEADLK;
|
|
|
|
/* Wait for the thread to finish. If it is already locked something
|
|
is wrong. There can only be one waiter. */
|
|
else if (__glibc_unlikely (atomic_compare_exchange_weak_acquire (&pd->joinid,
|
|
&self,
|
|
NULL)))
|
|
/* There is already somebody waiting for the thread. */
|
|
return EINVAL;
|
|
|
|
/* BLOCK waits either indefinitely or based on an absolute time. POSIX also
|
|
states a cancellation point shall occur for pthread_join, and we use the
|
|
same rationale for posix_timedjoin_np. Both clockwait_tid and the futex
|
|
call use the cancellable variant. */
|
|
if (block)
|
|
{
|
|
/* During the wait we change to asynchronous cancellation. If we
|
|
are cancelled the thread we are waiting for must be marked as
|
|
un-wait-ed for again. */
|
|
pthread_cleanup_push (cleanup, &pd->joinid);
|
|
|
|
if (abstime != NULL)
|
|
result = clockwait_tid (&pd->tid, clockid, abstime);
|
|
else
|
|
{
|
|
pid_t tid;
|
|
/* We need acquire MO here so that we synchronize with the
|
|
kernel's store to 0 when the clone terminates. (see above) */
|
|
while ((tid = atomic_load_acquire (&pd->tid)) != 0)
|
|
lll_futex_wait_cancel (&pd->tid, tid, LLL_SHARED);
|
|
}
|
|
|
|
pthread_cleanup_pop (0);
|
|
}
|
|
|
|
void *pd_result = pd->result;
|
|
if (__glibc_likely (result == 0))
|
|
{
|
|
/* We mark the thread as terminated and as joined. */
|
|
pd->tid = -1;
|
|
|
|
/* Store the return value if the caller is interested. */
|
|
if (thread_return != NULL)
|
|
*thread_return = pd_result;
|
|
|
|
/* Free the TCB. */
|
|
__free_tcb (pd);
|
|
}
|
|
else
|
|
pd->joinid = NULL;
|
|
|
|
LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd_result);
|
|
|
|
return result;
|
|
}
|