2018-04-01 23:43:22 +00:00
|
|
|
/* Wait on a condition. Generic version.
|
2019-01-01 00:11:28 +00:00
|
|
|
Copyright (C) 2000-2019 Free Software Foundation, Inc.
|
2018-04-01 23:43:22 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2018-04-02 14:37:36 +00:00
|
|
|
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.
|
2018-04-01 23:43:22 +00:00
|
|
|
|
|
|
|
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
|
2018-04-02 14:37:36 +00:00
|
|
|
Lesser General Public License for more details.
|
2018-04-01 23:43:22 +00:00
|
|
|
|
2018-04-02 14:37:36 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2018-04-01 23:43:22 +00:00
|
|
|
|
|
|
|
#include <pthread.h>
|
|
|
|
|
|
|
|
#include <pt-internal.h>
|
hurd: Avoid local PLTs in libpthread.
* htl/cthreads-compat.c (__cthread_detach): Call __pthread_detach
instead of pthread_detach.
(__cthread_fork): Call __pthread_create instead of pthread_create.
(__cthread_keycreate): Call __pthread_key_create instead of
pthread_key_create.
(__cthread_getspecific): Call __pthread_getspecific instead of
pthread_getspecific.
(__cthread_setspecific): Call __pthread_setspecific instead of
pthread_setspecific.
* htl/pt-alloc.c (__pthread_alloc): Call __pthread_mutex_lock and
__pthread_mutex_unlock instead of pthread_mutex_lock and
pthread_mutex_unlock.
* htl/pt-cleanup.c (__pthread_get_cleanup_stack): Rename to
___pthread_get_cleanup_stack.
(__pthread_get_cleanup_stack): New strong alias.
* htl/pt-create.c: Include <pthreadP.h>.
(entry_point): Call __pthread_exit instead of pthread_exit.
(pthread_create): Rename to __pthread_create.
(pthread_create): New strong alias.
* htl/pt-detach.c (pthread_detach): Rename to __pthread_detach.
(pthread_detach): New strong alias.
(__pthread_detach): Call __pthread_cond_broadcast instead of
pthread_cond_broadcast.
* htl/pt-exit.c (__pthread_exit): Call __pthread_setcancelstate
instead of pthread_setcancelstate.
* htl/pt-testcancel.c: Include <pthreadP.h>.
(pthread_testcancel): Call __pthread_exit instead of pthread_exit.
* sysdeps/htl/pt-attr-getstack.c: Include <pthreadP.h>
(__pthread_attr_getstack): Call __pthread_attr_getstackaddr and
__pthread_attr_getstacksize instead of pthread_attr_getstackaddr and
pthread_attr_getstacksize.
* sysdeps/htl/pt-attr-getstackaddr.c (pthread_attr_getstackaddr):
Rename to __pthread_attr_getstackaddr.
(pthread_attr_getstackaddr): New strong alias.
* sysdeps/htl/pt-attr-getstacksize.c (pthread_attr_getstacksize):
Rename to __pthread_attr_getstacksize.
(pthread_attr_getstacksize): New strong alias.
* sysdeps/htl/pt-attr-setstack.c: Include <pthreadP.h>.
(pthread_attr_setstack): Rename to __pthread_attr_setstack.
(pthread_attr_setstack): New strong alias.
(__pthread_attr_setstack): Call __pthread_attr_getstacksize,
__pthread_attr_setstacksize and __pthread_attr_setstackaddr instead of
pthread_attr_getstacksize, pthread_attr_setstacksize and
pthread_attr_setstackaddr.
* sysdeps/htl/pt-attr-setstackaddr.c (pthread_attr_setstackaddr):
Rename to __pthread_attr_setstackaddr.
(pthread_attr_setstackaddr): New strong alias.
* sysdeps/htl/pt-attr-setstacksize.c (pthread_attr_setstacksize):
Rename to __pthread_attr_setstacksize.
(pthread_attr_setstacksize): New strong alias.
* sysdeps/htl/pt-cond-timedwait.c: Include <pthreadP.h>.
(__pthread_cond_timedwait_internal): Use __pthread_exit instead of
pthread_exit.
* sysdeps/htl/pt-key-create.c: Include <pthreadP.h>.
(__pthread_key_create): New hidden def.
* sysdeps/htl/pt-key.h: Include <pthreadP.h>.
* sysdeps/htl/pthreadP.h (_pthread_mutex_init,
__pthread_cond_broadcast, __pthread_create, __pthread_detach,
__pthread_exit, __pthread_key_create, __pthread_getspecific,
__pthread_setspecific, __pthread_setcancelstate,
__pthread_attr_getstackaddr, __pthread_attr_setstackaddr,
__pthread_attr_getstacksize, __pthread_attr_setstacksize,
__pthread_attr_setstack, ___pthread_get_cleanup_stack): New
declarations.
(__pthread_key_create, _pthread_mutex_init): New hidden declarations.
* sysdeps/mach/hurd/htl/pt-attr-setstackaddr.c
(pthread_attr_setstackaddr): Rename to __pthread_attr_setstackaddr.
(pthread_attr_setstackaddr): New strong alias.
* sysdeps/mach/hurd/htl/pt-attr-setstacksize.c
(pthread_attr_setstacksize): Rename to __pthread_attr_setstacksize.
(pthread_attr_setstacksize): New strong alias.
* sysdeps/mach/hurd/htl/pt-docancel.c: Include <pthreadP.h>.
(call_exit): Call __pthread_exit instead of pthread_exit.
* sysdeps/mach/hurd/htl/pt-mutex-init.c: Include <pthreadP.h>.
(_pthread_mutex_init): New hidden definition.
* sysdeps/mach/hurd/htl/pt-sysdep.c: Include <pthreadP.h>.
(_init_routine): Call __pthread_attr_init and __pthread_attr_setstack
instead of pthread_attr_init and pthread_attr_setstack.
2018-04-02 18:08:37 +00:00
|
|
|
#include <pthreadP.h>
|
2019-10-24 14:20:56 +00:00
|
|
|
#include <time.h>
|
2018-04-01 23:43:22 +00:00
|
|
|
|
|
|
|
extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond,
|
|
|
|
pthread_mutex_t *mutex,
|
|
|
|
const struct timespec *abstime);
|
|
|
|
|
|
|
|
int
|
|
|
|
__pthread_cond_timedwait (pthread_cond_t *cond,
|
|
|
|
pthread_mutex_t *mutex,
|
|
|
|
const struct timespec *abstime)
|
|
|
|
{
|
|
|
|
return __pthread_cond_timedwait_internal (cond, mutex, abstime);
|
|
|
|
}
|
|
|
|
|
|
|
|
strong_alias (__pthread_cond_timedwait, pthread_cond_timedwait);
|
|
|
|
|
|
|
|
struct cancel_ctx
|
|
|
|
{
|
|
|
|
struct __pthread *wakeup;
|
|
|
|
pthread_cond_t *cond;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
cancel_hook (void *arg)
|
|
|
|
{
|
|
|
|
struct cancel_ctx *ctx = arg;
|
|
|
|
struct __pthread *wakeup = ctx->wakeup;
|
|
|
|
pthread_cond_t *cond = ctx->cond;
|
|
|
|
int unblock;
|
|
|
|
|
|
|
|
__pthread_spin_lock (&cond->__lock);
|
|
|
|
/* The thread only needs to be awaken if it's blocking or about to block.
|
|
|
|
If it was already unblocked, it's not queued any more. */
|
|
|
|
unblock = wakeup->prevp != NULL;
|
|
|
|
if (unblock)
|
|
|
|
__pthread_dequeue (wakeup);
|
|
|
|
__pthread_spin_unlock (&cond->__lock);
|
|
|
|
|
|
|
|
if (unblock)
|
|
|
|
__pthread_wakeup (wakeup);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Block on condition variable COND until ABSTIME. As a GNU
|
|
|
|
extension, if ABSTIME is NULL, then wait forever. MUTEX should be
|
|
|
|
held by the calling thread. On return, MUTEX will be held by the
|
|
|
|
calling thread. */
|
|
|
|
int
|
|
|
|
__pthread_cond_timedwait_internal (pthread_cond_t *cond,
|
|
|
|
pthread_mutex_t *mutex,
|
|
|
|
const struct timespec *abstime)
|
|
|
|
{
|
|
|
|
error_t err;
|
|
|
|
int cancelled, oldtype, drain;
|
|
|
|
clockid_t clock_id = __pthread_default_condattr.__clock;
|
|
|
|
|
2019-10-24 14:20:56 +00:00
|
|
|
if (abstime && ! valid_nanoseconds (abstime->tv_nsec))
|
2018-04-01 23:43:22 +00:00
|
|
|
return EINVAL;
|
|
|
|
|
|
|
|
struct __pthread *self = _pthread_self ();
|
|
|
|
struct cancel_ctx ctx;
|
|
|
|
ctx.wakeup = self;
|
|
|
|
ctx.cond = cond;
|
|
|
|
|
|
|
|
/* Test for a pending cancellation request, switch to deferred mode for
|
|
|
|
safer resource handling, and prepare the hook to call in case we're
|
|
|
|
cancelled while blocking. Once CANCEL_LOCK is released, the cancellation
|
|
|
|
hook can be called by another thread at any time. Whatever happens,
|
|
|
|
this function must exit with MUTEX locked.
|
|
|
|
|
|
|
|
This function contains inline implementations of pthread_testcancel and
|
|
|
|
pthread_setcanceltype to reduce locking overhead. */
|
|
|
|
__pthread_mutex_lock (&self->cancel_lock);
|
|
|
|
cancelled = (self->cancel_state == PTHREAD_CANCEL_ENABLE)
|
|
|
|
&& self->cancel_pending;
|
|
|
|
|
|
|
|
if (!cancelled)
|
|
|
|
{
|
|
|
|
self->cancel_hook = cancel_hook;
|
|
|
|
self->cancel_hook_arg = &ctx;
|
|
|
|
oldtype = self->cancel_type;
|
|
|
|
|
|
|
|
if (oldtype != PTHREAD_CANCEL_DEFERRED)
|
|
|
|
self->cancel_type = PTHREAD_CANCEL_DEFERRED;
|
|
|
|
|
|
|
|
/* Add ourselves to the list of waiters. This is done while setting
|
|
|
|
the cancellation hook to simplify the cancellation procedure, i.e.
|
|
|
|
if the thread is queued, it can be cancelled, otherwise it is
|
|
|
|
already unblocked, progressing on the return path. */
|
|
|
|
__pthread_spin_lock (&cond->__lock);
|
|
|
|
__pthread_enqueue (&cond->__queue, self);
|
|
|
|
if (cond->__attr != NULL)
|
|
|
|
clock_id = cond->__attr->__clock;
|
|
|
|
__pthread_spin_unlock (&cond->__lock);
|
|
|
|
}
|
|
|
|
__pthread_mutex_unlock (&self->cancel_lock);
|
|
|
|
|
|
|
|
if (cancelled)
|
hurd: Avoid local PLTs in libpthread.
* htl/cthreads-compat.c (__cthread_detach): Call __pthread_detach
instead of pthread_detach.
(__cthread_fork): Call __pthread_create instead of pthread_create.
(__cthread_keycreate): Call __pthread_key_create instead of
pthread_key_create.
(__cthread_getspecific): Call __pthread_getspecific instead of
pthread_getspecific.
(__cthread_setspecific): Call __pthread_setspecific instead of
pthread_setspecific.
* htl/pt-alloc.c (__pthread_alloc): Call __pthread_mutex_lock and
__pthread_mutex_unlock instead of pthread_mutex_lock and
pthread_mutex_unlock.
* htl/pt-cleanup.c (__pthread_get_cleanup_stack): Rename to
___pthread_get_cleanup_stack.
(__pthread_get_cleanup_stack): New strong alias.
* htl/pt-create.c: Include <pthreadP.h>.
(entry_point): Call __pthread_exit instead of pthread_exit.
(pthread_create): Rename to __pthread_create.
(pthread_create): New strong alias.
* htl/pt-detach.c (pthread_detach): Rename to __pthread_detach.
(pthread_detach): New strong alias.
(__pthread_detach): Call __pthread_cond_broadcast instead of
pthread_cond_broadcast.
* htl/pt-exit.c (__pthread_exit): Call __pthread_setcancelstate
instead of pthread_setcancelstate.
* htl/pt-testcancel.c: Include <pthreadP.h>.
(pthread_testcancel): Call __pthread_exit instead of pthread_exit.
* sysdeps/htl/pt-attr-getstack.c: Include <pthreadP.h>
(__pthread_attr_getstack): Call __pthread_attr_getstackaddr and
__pthread_attr_getstacksize instead of pthread_attr_getstackaddr and
pthread_attr_getstacksize.
* sysdeps/htl/pt-attr-getstackaddr.c (pthread_attr_getstackaddr):
Rename to __pthread_attr_getstackaddr.
(pthread_attr_getstackaddr): New strong alias.
* sysdeps/htl/pt-attr-getstacksize.c (pthread_attr_getstacksize):
Rename to __pthread_attr_getstacksize.
(pthread_attr_getstacksize): New strong alias.
* sysdeps/htl/pt-attr-setstack.c: Include <pthreadP.h>.
(pthread_attr_setstack): Rename to __pthread_attr_setstack.
(pthread_attr_setstack): New strong alias.
(__pthread_attr_setstack): Call __pthread_attr_getstacksize,
__pthread_attr_setstacksize and __pthread_attr_setstackaddr instead of
pthread_attr_getstacksize, pthread_attr_setstacksize and
pthread_attr_setstackaddr.
* sysdeps/htl/pt-attr-setstackaddr.c (pthread_attr_setstackaddr):
Rename to __pthread_attr_setstackaddr.
(pthread_attr_setstackaddr): New strong alias.
* sysdeps/htl/pt-attr-setstacksize.c (pthread_attr_setstacksize):
Rename to __pthread_attr_setstacksize.
(pthread_attr_setstacksize): New strong alias.
* sysdeps/htl/pt-cond-timedwait.c: Include <pthreadP.h>.
(__pthread_cond_timedwait_internal): Use __pthread_exit instead of
pthread_exit.
* sysdeps/htl/pt-key-create.c: Include <pthreadP.h>.
(__pthread_key_create): New hidden def.
* sysdeps/htl/pt-key.h: Include <pthreadP.h>.
* sysdeps/htl/pthreadP.h (_pthread_mutex_init,
__pthread_cond_broadcast, __pthread_create, __pthread_detach,
__pthread_exit, __pthread_key_create, __pthread_getspecific,
__pthread_setspecific, __pthread_setcancelstate,
__pthread_attr_getstackaddr, __pthread_attr_setstackaddr,
__pthread_attr_getstacksize, __pthread_attr_setstacksize,
__pthread_attr_setstack, ___pthread_get_cleanup_stack): New
declarations.
(__pthread_key_create, _pthread_mutex_init): New hidden declarations.
* sysdeps/mach/hurd/htl/pt-attr-setstackaddr.c
(pthread_attr_setstackaddr): Rename to __pthread_attr_setstackaddr.
(pthread_attr_setstackaddr): New strong alias.
* sysdeps/mach/hurd/htl/pt-attr-setstacksize.c
(pthread_attr_setstacksize): Rename to __pthread_attr_setstacksize.
(pthread_attr_setstacksize): New strong alias.
* sysdeps/mach/hurd/htl/pt-docancel.c: Include <pthreadP.h>.
(call_exit): Call __pthread_exit instead of pthread_exit.
* sysdeps/mach/hurd/htl/pt-mutex-init.c: Include <pthreadP.h>.
(_pthread_mutex_init): New hidden definition.
* sysdeps/mach/hurd/htl/pt-sysdep.c: Include <pthreadP.h>.
(_init_routine): Call __pthread_attr_init and __pthread_attr_setstack
instead of pthread_attr_init and pthread_attr_setstack.
2018-04-02 18:08:37 +00:00
|
|
|
__pthread_exit (PTHREAD_CANCELED);
|
2018-04-01 23:43:22 +00:00
|
|
|
|
|
|
|
/* Release MUTEX before blocking. */
|
|
|
|
__pthread_mutex_unlock (mutex);
|
|
|
|
|
|
|
|
/* Block the thread. */
|
|
|
|
if (abstime != NULL)
|
|
|
|
err = __pthread_timedblock (self, abstime, clock_id);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
err = 0;
|
|
|
|
__pthread_block (self);
|
|
|
|
}
|
|
|
|
|
|
|
|
__pthread_spin_lock (&cond->__lock);
|
|
|
|
if (self->prevp == NULL)
|
|
|
|
{
|
|
|
|
/* Another thread removed us from the list of waiters, which means a
|
|
|
|
wakeup message has been sent. It was either consumed while we were
|
|
|
|
blocking, or queued after we timed out and before we acquired the
|
|
|
|
condition lock, in which case the message queue must be drained. */
|
|
|
|
if (!err)
|
|
|
|
drain = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
assert (err == ETIMEDOUT);
|
|
|
|
drain = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* We're still in the list of waiters. Noone attempted to wake us up,
|
|
|
|
i.e. we timed out. */
|
|
|
|
assert (err == ETIMEDOUT);
|
|
|
|
__pthread_dequeue (self);
|
|
|
|
drain = 0;
|
|
|
|
}
|
|
|
|
__pthread_spin_unlock (&cond->__lock);
|
|
|
|
|
|
|
|
if (drain)
|
|
|
|
__pthread_block (self);
|
|
|
|
|
|
|
|
/* We're almost done. Remove the unblock hook, restore the previous
|
|
|
|
cancellation type, and check for a pending cancellation request. */
|
|
|
|
__pthread_mutex_lock (&self->cancel_lock);
|
|
|
|
self->cancel_hook = NULL;
|
|
|
|
self->cancel_hook_arg = NULL;
|
|
|
|
self->cancel_type = oldtype;
|
|
|
|
cancelled = (self->cancel_state == PTHREAD_CANCEL_ENABLE)
|
|
|
|
&& self->cancel_pending;
|
|
|
|
__pthread_mutex_unlock (&self->cancel_lock);
|
|
|
|
|
|
|
|
/* Reacquire MUTEX before returning/cancelling. */
|
|
|
|
__pthread_mutex_lock (mutex);
|
|
|
|
|
|
|
|
if (cancelled)
|
hurd: Avoid local PLTs in libpthread.
* htl/cthreads-compat.c (__cthread_detach): Call __pthread_detach
instead of pthread_detach.
(__cthread_fork): Call __pthread_create instead of pthread_create.
(__cthread_keycreate): Call __pthread_key_create instead of
pthread_key_create.
(__cthread_getspecific): Call __pthread_getspecific instead of
pthread_getspecific.
(__cthread_setspecific): Call __pthread_setspecific instead of
pthread_setspecific.
* htl/pt-alloc.c (__pthread_alloc): Call __pthread_mutex_lock and
__pthread_mutex_unlock instead of pthread_mutex_lock and
pthread_mutex_unlock.
* htl/pt-cleanup.c (__pthread_get_cleanup_stack): Rename to
___pthread_get_cleanup_stack.
(__pthread_get_cleanup_stack): New strong alias.
* htl/pt-create.c: Include <pthreadP.h>.
(entry_point): Call __pthread_exit instead of pthread_exit.
(pthread_create): Rename to __pthread_create.
(pthread_create): New strong alias.
* htl/pt-detach.c (pthread_detach): Rename to __pthread_detach.
(pthread_detach): New strong alias.
(__pthread_detach): Call __pthread_cond_broadcast instead of
pthread_cond_broadcast.
* htl/pt-exit.c (__pthread_exit): Call __pthread_setcancelstate
instead of pthread_setcancelstate.
* htl/pt-testcancel.c: Include <pthreadP.h>.
(pthread_testcancel): Call __pthread_exit instead of pthread_exit.
* sysdeps/htl/pt-attr-getstack.c: Include <pthreadP.h>
(__pthread_attr_getstack): Call __pthread_attr_getstackaddr and
__pthread_attr_getstacksize instead of pthread_attr_getstackaddr and
pthread_attr_getstacksize.
* sysdeps/htl/pt-attr-getstackaddr.c (pthread_attr_getstackaddr):
Rename to __pthread_attr_getstackaddr.
(pthread_attr_getstackaddr): New strong alias.
* sysdeps/htl/pt-attr-getstacksize.c (pthread_attr_getstacksize):
Rename to __pthread_attr_getstacksize.
(pthread_attr_getstacksize): New strong alias.
* sysdeps/htl/pt-attr-setstack.c: Include <pthreadP.h>.
(pthread_attr_setstack): Rename to __pthread_attr_setstack.
(pthread_attr_setstack): New strong alias.
(__pthread_attr_setstack): Call __pthread_attr_getstacksize,
__pthread_attr_setstacksize and __pthread_attr_setstackaddr instead of
pthread_attr_getstacksize, pthread_attr_setstacksize and
pthread_attr_setstackaddr.
* sysdeps/htl/pt-attr-setstackaddr.c (pthread_attr_setstackaddr):
Rename to __pthread_attr_setstackaddr.
(pthread_attr_setstackaddr): New strong alias.
* sysdeps/htl/pt-attr-setstacksize.c (pthread_attr_setstacksize):
Rename to __pthread_attr_setstacksize.
(pthread_attr_setstacksize): New strong alias.
* sysdeps/htl/pt-cond-timedwait.c: Include <pthreadP.h>.
(__pthread_cond_timedwait_internal): Use __pthread_exit instead of
pthread_exit.
* sysdeps/htl/pt-key-create.c: Include <pthreadP.h>.
(__pthread_key_create): New hidden def.
* sysdeps/htl/pt-key.h: Include <pthreadP.h>.
* sysdeps/htl/pthreadP.h (_pthread_mutex_init,
__pthread_cond_broadcast, __pthread_create, __pthread_detach,
__pthread_exit, __pthread_key_create, __pthread_getspecific,
__pthread_setspecific, __pthread_setcancelstate,
__pthread_attr_getstackaddr, __pthread_attr_setstackaddr,
__pthread_attr_getstacksize, __pthread_attr_setstacksize,
__pthread_attr_setstack, ___pthread_get_cleanup_stack): New
declarations.
(__pthread_key_create, _pthread_mutex_init): New hidden declarations.
* sysdeps/mach/hurd/htl/pt-attr-setstackaddr.c
(pthread_attr_setstackaddr): Rename to __pthread_attr_setstackaddr.
(pthread_attr_setstackaddr): New strong alias.
* sysdeps/mach/hurd/htl/pt-attr-setstacksize.c
(pthread_attr_setstacksize): Rename to __pthread_attr_setstacksize.
(pthread_attr_setstacksize): New strong alias.
* sysdeps/mach/hurd/htl/pt-docancel.c: Include <pthreadP.h>.
(call_exit): Call __pthread_exit instead of pthread_exit.
* sysdeps/mach/hurd/htl/pt-mutex-init.c: Include <pthreadP.h>.
(_pthread_mutex_init): New hidden definition.
* sysdeps/mach/hurd/htl/pt-sysdep.c: Include <pthreadP.h>.
(_init_routine): Call __pthread_attr_init and __pthread_attr_setstack
instead of pthread_attr_init and pthread_attr_setstack.
2018-04-02 18:08:37 +00:00
|
|
|
__pthread_exit (PTHREAD_CANCELED);
|
2018-04-01 23:43:22 +00:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|