mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 14:30:06 +00:00
28cada0418
* htl/pt-join.c (__pthread_join): Move implementation to... (__pthread_join_common): ... new function. Add try, timed and clock support. (__pthread_join): Reimplement on top of __pthread_join_common. (__pthread_tryjoin_np, __pthread_timedjoin_np, __pthread_clockjoin_np): Implement on top of __pthread_join_common. (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np): New aliases. * hurd/hurdlock.c (__lll_abstimed_wait, __lll_abstimed_xwait, __lll_abstimed_lock): Check for supported clock. * sysdeps/htl/pt-cond-timedwait.c (__pthread_cond_timedwait_internal): Add clockid parameter and support it. (__pthread_cond_timedwait): Pass -1 as clockid. (__pthread_cond_clockwait): New function. (pthread_cond_clockwait): New alias. * sysdeps/htl/pt-cond-wait.c (__pthread_cond_timedwait_internal): Update prototype. (__pthread_cond_wait): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedrdlock.c (__pthread_rwlock_timedrdlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockrdlock): New function. (pthread_rwlock_clockrdlock): New alias. * sysdeps/htl/pt-rwlock-rdlock.c (__pthread_rwlock_timedrdlock_internal): Update prototype. (__pthread_rwlock_rdlock): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedwrlock.c (__pthread_rwlock_timedwrlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockwrlock): New function. (pthread_rwlock_clockwrlock): New alias. * sysdeps/htl/pt-rwlock-wrlock.c (__pthread_rwlock_timedwrlock_internal): Update prototype. (__pthread_rwlock_wrlock): Pass -1 as clockid. * sysdeps/mach/hurd/htl/pt-mutex-timedlock.c (__pthread_mutex_timedlock): Move implementation to (__pthread_mutex_clocklock): New function with additional clockid parameter and support it. (pthread_mutex_clocklock): New alias. (__pthread_mutex_timedlock): Reimplement on top of __pthread_mutex_clocklock. * sysdeps/htl/pthread.h (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np, pthread_mutex_clocklock, pthread_cond_clockwait, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock): New prototypes. * sysdeps/htl/pthreadP.h (__pthread_cond_clockwait): New prototype. * htl/Versions (GLIBC_2.32): Add pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np. * sysdeps/mach/hurd/i386/libpthread.abilist (pthread_clockjoin_np, pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_timedjoin_np, pthread_tryjoin_np): New functions. * nptl/tst-abstime.c, nptl/tst-join10.c, nptl/tst-join11.c, nptl/tst-join12.c, nptl/tst-join13.c, nptl/tst-join14.c, nptl/tst-join2.c, nptl/tst-join3.c, nptl/tst-join8.c, nptl/tst-join9.c, nptl/tst-mutex-errorcheck.c, nptl/tst-pthread-mutexattr.c, nptl/tst-mutex11.c, nptl/tst-mutex5.c, nptl/tst-mutex7.c, nptl/tst-mutex7robus.c, nptl/tst-mutex9.c, nptl/tst-rwlock12.c, nptl/tst-rwlock14.c: Move to sysdeps/pthread. * sysdeps/pthread/tst-mutex8.c: Move back to nptl. * nptl/Makefile (tests): Move tst-mutex5, tst-mutex7, tst-mutex7robust, tst-mutex9, tst-mutex11, tst-rwlock12, tst-rwlock14, tst-join2, tst-join3, tst-join8, tst-join9 tst-join10, tst-join11, tst-join12, tst-join13, tst-join14, tst-abstime, tst-mutex-errorcheck, tst-pthread-mutexattr to ... * sysdeps/pthread/Makefile (tests): ... here.
124 lines
3.4 KiB
C
124 lines
3.4 KiB
C
/* Wait for thread termination.
|
|
Copyright (C) 2000-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 <errno.h>
|
|
#include <pthread.h>
|
|
#include <stddef.h>
|
|
|
|
#include <pt-internal.h>
|
|
|
|
/* Make calling thread wait for termination of thread THREAD. Return
|
|
the exit status of the thread in *STATUS. */
|
|
static int
|
|
__pthread_join_common (pthread_t thread, void **status, int try,
|
|
clockid_t clockid,
|
|
const struct timespec *abstime)
|
|
{
|
|
struct __pthread *pthread;
|
|
int err = 0;
|
|
|
|
/* Lookup the thread structure for THREAD. */
|
|
pthread = __pthread_getid (thread);
|
|
if (pthread == NULL)
|
|
return ESRCH;
|
|
|
|
if (pthread == _pthread_self ())
|
|
return EDEADLK;
|
|
|
|
__pthread_mutex_lock (&pthread->state_lock);
|
|
|
|
if (try == 0)
|
|
{
|
|
pthread_cleanup_push ((void (*)(void *)) __pthread_mutex_unlock,
|
|
&pthread->state_lock);
|
|
|
|
/* Rely on pthread_cond_wait being a cancellation point to make
|
|
pthread_join one too. */
|
|
while (pthread->state == PTHREAD_JOINABLE && err != ETIMEDOUT)
|
|
err = __pthread_cond_clockwait (&pthread->state_cond,
|
|
&pthread->state_lock,
|
|
clockid, abstime);
|
|
|
|
pthread_cleanup_pop (0);
|
|
}
|
|
|
|
switch (pthread->state)
|
|
{
|
|
case PTHREAD_JOINABLE:
|
|
__pthread_mutex_unlock (&pthread->state_lock);
|
|
if (err != ETIMEDOUT)
|
|
err = EBUSY;
|
|
break;
|
|
|
|
case PTHREAD_EXITED:
|
|
/* THREAD has already exited. Salvage its exit status. */
|
|
if (status != NULL)
|
|
*status = pthread->status;
|
|
|
|
__pthread_mutex_unlock (&pthread->state_lock);
|
|
|
|
__pthread_dealloc (pthread);
|
|
break;
|
|
|
|
case PTHREAD_TERMINATED:
|
|
/* Pretend THREAD wasn't there in the first place. */
|
|
__pthread_mutex_unlock (&pthread->state_lock);
|
|
err = ESRCH;
|
|
break;
|
|
|
|
default:
|
|
/* Thou shalt not join non-joinable threads! */
|
|
__pthread_mutex_unlock (&pthread->state_lock);
|
|
err = EINVAL;
|
|
break;
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
int
|
|
__pthread_join (pthread_t thread, void **status)
|
|
{
|
|
return __pthread_join_common (thread, status, 0, CLOCK_REALTIME, NULL);
|
|
}
|
|
weak_alias (__pthread_join, pthread_join);
|
|
|
|
int
|
|
__pthread_tryjoin_np (pthread_t thread, void **status)
|
|
{
|
|
return __pthread_join_common (thread, status, 1, CLOCK_REALTIME, NULL);
|
|
}
|
|
weak_alias (__pthread_tryjoin_np, pthread_tryjoin_np);
|
|
|
|
int
|
|
__pthread_timedjoin_np (pthread_t thread, void **status,
|
|
const struct timespec *abstime)
|
|
{
|
|
return __pthread_join_common (thread, status, 0, CLOCK_REALTIME, abstime);
|
|
}
|
|
weak_alias (__pthread_timedjoin_np, pthread_timedjoin_np);
|
|
|
|
int
|
|
__pthread_clockjoin_np (pthread_t thread, void **status,
|
|
clockid_t clockid,
|
|
const struct timespec *abstime)
|
|
{
|
|
return __pthread_join_common (thread, status, 0, clockid, abstime);
|
|
}
|
|
weak_alias (__pthread_clockjoin_np, pthread_clockjoin_np);
|