mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08: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.
112 lines
3.6 KiB
C
112 lines
3.6 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 <signal.h>
|
|
#include <stdlib.h>
|
|
#include "pthreadP.h"
|
|
#include <atomic.h>
|
|
#include <sysdep.h>
|
|
|
|
|
|
int
|
|
pthread_cancel (pthread_t th)
|
|
{
|
|
volatile struct pthread *pd = (volatile struct pthread *) th;
|
|
|
|
/* Make sure the descriptor is valid. */
|
|
if (INVALID_TD_P (pd))
|
|
/* Not a valid thread handle. */
|
|
return ESRCH;
|
|
|
|
#ifdef SHARED
|
|
pthread_cancel_init ();
|
|
#endif
|
|
int result = 0;
|
|
int oldval;
|
|
int newval;
|
|
do
|
|
{
|
|
again:
|
|
oldval = pd->cancelhandling;
|
|
newval = oldval | CANCELING_BITMASK | CANCELED_BITMASK;
|
|
|
|
/* Avoid doing unnecessary work. The atomic operation can
|
|
potentially be expensive if the bug has to be locked and
|
|
remote cache lines have to be invalidated. */
|
|
if (oldval == newval)
|
|
break;
|
|
|
|
/* If the cancellation is handled asynchronously just send a
|
|
signal. We avoid this if possible since it's more
|
|
expensive. */
|
|
if (CANCEL_ENABLED_AND_CANCELED_AND_ASYNCHRONOUS (newval))
|
|
{
|
|
/* Mark the cancellation as "in progress". */
|
|
if (atomic_compare_and_exchange_bool_acq (&pd->cancelhandling,
|
|
oldval | CANCELING_BITMASK,
|
|
oldval))
|
|
goto again;
|
|
|
|
#ifdef SIGCANCEL
|
|
/* The cancellation handler will take care of marking the
|
|
thread as canceled. */
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
|
|
/* One comment: The PID field in the TCB can temporarily be
|
|
changed (in fork). But this must not affect this code
|
|
here. Since this function would have to be called while
|
|
the thread is executing fork, it would have to happen in
|
|
a signal handler. But this is no allowed, pthread_cancel
|
|
is not guaranteed to be async-safe. */
|
|
int val;
|
|
val = INTERNAL_SYSCALL (tgkill, err, 3,
|
|
THREAD_GETMEM (THREAD_SELF, pid), pd->tid,
|
|
SIGCANCEL);
|
|
|
|
if (INTERNAL_SYSCALL_ERROR_P (val, err))
|
|
result = INTERNAL_SYSCALL_ERRNO (val, err);
|
|
#else
|
|
/* It should be impossible to get here at all, since
|
|
pthread_setcanceltype should never have allowed
|
|
PTHREAD_CANCEL_ASYNCHRONOUS to be set. */
|
|
abort ();
|
|
#endif
|
|
|
|
break;
|
|
}
|
|
|
|
/* A single-threaded process should be able to kill itself, since
|
|
there is nothing in the POSIX specification that says that it
|
|
cannot. So we set multiple_threads to true so that cancellation
|
|
points get executed. */
|
|
THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1);
|
|
#ifndef TLS_MULTIPLE_THREADS_IN_TCB
|
|
__pthread_multiple_threads = *__libc_multiple_threads_ptr = 1;
|
|
#endif
|
|
}
|
|
/* Mark the thread as canceled. This has to be done
|
|
atomically since other bits could be modified as well. */
|
|
while (atomic_compare_and_exchange_bool_acq (&pd->cancelhandling, newval,
|
|
oldval));
|
|
|
|
return result;
|
|
}
|
|
|
|
PTHREAD_STATIC_FN_REQUIRE (pthread_create)
|