mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 22:10:13 +00:00
f96a85e0fe
Rework 57e1651557 ("hurd: Avoid PLT ref for __pthread_get_cleanup_stack")
to keep the __pthread_get_cleanup_stack symbol.
* htl/pt-cleanup.c (__pthread_get_cleanup_stack): Rename to
___pthread_get_cleanup_stack.
(__pthread_get_cleanup_stack): Remove hidden def, add alias.
* htl/pt-exit.c (__pthread_exit): Use ___pthread_get_cleanup_stack
instead of __pthread_get_cleanup_stack.
* sysdeps/htl/pthread-functions.h [libpthread]
(__pthread_get_cleanup_stack): Remove hidden proto.
* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Add
prototype.
* sysdeps/htl/pthreadP.h (___pthread_get_cleanup_stack): Add hidden
attribute.
* htl/pt-join.c (__pthread_get_cleanup_stack): Define to
___pthread_get_cleanup_stack.
78 lines
2.3 KiB
C
78 lines
2.3 KiB
C
/* Wait for thread termination.
|
|
Copyright (C) 2000-2018 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <stddef.h>
|
|
|
|
#include <pt-internal.h>
|
|
|
|
#define __pthread_get_cleanup_stack ___pthread_get_cleanup_stack
|
|
|
|
/* Make calling thread wait for termination of thread THREAD. Return
|
|
the exit status of the thread in *STATUS. */
|
|
int
|
|
pthread_join (pthread_t thread, void **status)
|
|
{
|
|
struct __pthread *pthread;
|
|
int err = 0;
|
|
|
|
/* Lookup the thread structure for THREAD. */
|
|
pthread = __pthread_getid (thread);
|
|
if (pthread == NULL)
|
|
return ESRCH;
|
|
|
|
__pthread_mutex_lock (&pthread->state_lock);
|
|
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)
|
|
__pthread_cond_wait (&pthread->state_cond, &pthread->state_lock);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
switch (pthread->state)
|
|
{
|
|
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;
|
|
}
|