mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 22:10:13 +00:00
14bb4e57c0
This patch changes the some function declaration from K&R style to default ANSI C. * nptl/pthread_cancel.c (pthread_cancel): Use ANSI prototype. * nptl/pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise. * nptl/pthread_cond_wait.c (__pthread_cond_wait): Likewise. * nptl/pthread_exit.c (__pthread_exit): Likewise. * nptl/pthread_join.c (pthread_join): Likewise. * nptl/pthread_timedjoin.c (pthread_timedjoin_np): Likewise. * sysdeps/posix/waitid.c (__waitid): Likewise. * sysdeps/unix/sysv/linux/arm/pread.c (__libc_pread): Likewise. * sysdeps/unix/sysv/linux/arm/pread64.c (__libc_pread64): Likewise. * sysdeps/unix/sysv/linux/arm/pwrite.c (__libc_pwrite): Likewise. * sysdeps/unix/sysv/linux/arm/pwrite64.c (__libc_pwrite64): Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread.c (__libc_pread): Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread64.c (__libc_pread64): Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite.c (__libc_pwrite): Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite64.c (__libc_pwrite64): Likewsie. * sysdeps/unix/sysv/linux/mips/pread.c (__libc_pread): Likewise. * sysdeps/unix/sysv/linux/mips/pread64.c (__libc_pread64): Likewise. * sysdeps/unix/sysv/linux/mips/pwrite.c (__libc_pwrite): Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c (__libc_pwrite64): Likewise. * sysdeps/unix/sysv/linux/msgrcv.c (__libc_msgrcv): Likewise. * sysdeps/unix/sysv/linux/msgsnd.c (__libc_msgsnd): Likewise. * sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c (__libc_pread): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c (__libc_pread64): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c (__libc_pwrite): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c (__libc_pwrite64): Likewise. * sysdeps/unix/sysv/linux/pread.c (__libc_pread): Likewise. * sysdeps/unix/sysv/linux/pread64.c (__libc_pread64): Likewise. * sysdeps/unix/sysv/linux/preadv.c (PREADV): Likewise. * sysdeps/unix/sysv/linux/pthread_kill.c (__pthread_kill): Likewise. * sysdeps/unix/sysv/linux/pwrite.c (__libc_pwrite): Likewise. * sysdeps/unix/sysv/linux/pwrite64.c (__libc_pwrite64): Likewise. * sysdeps/unix/sysv/linux/pwritev.c (__libc_pwritev): Likewise. * sysdeps/unix/sysv/linux/sh/pread.c (__libc_pread): Likewise. * sysdeps/unix/sysv/linux/sh/pread64.c (__libc_pread64): Likewise. * sysdeps/unix/sysv/linux/sh/pwrite.c (__libc_pwrite): Likewise. * sysdeps/unix/sysv/linux/sh/pwrite64.c (__libc_write64): Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c (__sigsuspend): Likewise. * sysdeps/unix/sysv/linux/sigtimedwait.c (__sigtimedwait): Likewise. * sysdeps/unix/sysv/linux/sigwait.c (__sigwait): Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c (__sigwaitinfo): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c (__libc_msgrcv): Likewise.
118 lines
3.5 KiB
C
118 lines
3.5 KiB
C
/* Copyright (C) 2002-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
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 <stdlib.h>
|
|
|
|
#include <atomic.h>
|
|
#include "pthreadP.h"
|
|
|
|
#include <stap-probe.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. */
|
|
(void) atomic_compare_and_exchange_bool_acq ((struct pthread **) arg, NULL,
|
|
THREAD_SELF);
|
|
}
|
|
|
|
|
|
int
|
|
pthread_join (pthread_t threadid, void **thread_return)
|
|
{
|
|
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);
|
|
|
|
/* During the wait we change to asynchronous cancellation. If we
|
|
are canceled the thread we are waiting for must be marked as
|
|
un-wait-ed for again. */
|
|
pthread_cleanup_push (cleanup, &pd->joinid);
|
|
|
|
/* Switch to asynchronous cancellation. */
|
|
int oldtype = CANCEL_ASYNC ();
|
|
|
|
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. */
|
|
result = EDEADLK;
|
|
/* Wait for the thread to finish. If it is already locked something
|
|
is wrong. There can only be one waiter. */
|
|
else if (__builtin_expect (atomic_compare_and_exchange_bool_acq (&pd->joinid,
|
|
self,
|
|
NULL), 0))
|
|
/* There is already somebody waiting for the thread. */
|
|
result = EINVAL;
|
|
else
|
|
/* Wait for the child. */
|
|
lll_wait_tid (pd->tid);
|
|
|
|
|
|
/* Restore cancellation mode. */
|
|
CANCEL_RESET (oldtype);
|
|
|
|
/* Remove the handler. */
|
|
pthread_cleanup_pop (0);
|
|
|
|
|
|
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);
|
|
}
|
|
|
|
LIBC_PROBE (pthread_join_ret, 3, threadid, result, pd->result);
|
|
|
|
return result;
|
|
}
|