mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +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.
91 lines
2.7 KiB
C
91 lines
2.7 KiB
C
/* Copyright (C) 1997-2015 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 <signal.h>
|
|
#include <string.h>
|
|
|
|
#include <nptl/pthreadP.h>
|
|
#include <sysdep-cancel.h>
|
|
#include <sys/syscall.h>
|
|
|
|
#ifdef __NR_rt_sigtimedwait
|
|
|
|
static int
|
|
do_sigtimedwait (const sigset_t *set, siginfo_t *info,
|
|
const struct timespec *timeout)
|
|
{
|
|
#ifdef SIGCANCEL
|
|
sigset_t tmpset;
|
|
if (set != NULL
|
|
&& (__builtin_expect (__sigismember (set, SIGCANCEL), 0)
|
|
# ifdef SIGSETXID
|
|
|| __builtin_expect (__sigismember (set, SIGSETXID), 0)
|
|
# endif
|
|
))
|
|
{
|
|
/* Create a temporary mask without the bit for SIGCANCEL set. */
|
|
// We are not copying more than we have to.
|
|
memcpy (&tmpset, set, _NSIG / 8);
|
|
__sigdelset (&tmpset, SIGCANCEL);
|
|
# ifdef SIGSETXID
|
|
__sigdelset (&tmpset, SIGSETXID);
|
|
# endif
|
|
set = &tmpset;
|
|
}
|
|
#endif
|
|
|
|
/* XXX The size argument hopefully will have to be changed to the
|
|
real size of the user-level sigset_t. */
|
|
int result = INLINE_SYSCALL (rt_sigtimedwait, 4, set,
|
|
info, timeout, _NSIG / 8);
|
|
|
|
/* The kernel generates a SI_TKILL code in si_code in case tkill is
|
|
used. tkill is transparently used in raise(). Since having
|
|
SI_TKILL as a code is useful in general we fold the results
|
|
here. */
|
|
if (result != -1 && info != NULL && info->si_code == SI_TKILL)
|
|
info->si_code = SI_USER;
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/* Return any pending signal or wait for one for the given time. */
|
|
int
|
|
__sigtimedwait (const sigset_t *set, siginfo_t *info,
|
|
const struct timespec *timeout)
|
|
{
|
|
if (SINGLE_THREAD_P)
|
|
return do_sigtimedwait (set, info, timeout);
|
|
|
|
int oldtype = LIBC_CANCEL_ASYNC ();
|
|
|
|
/* XXX The size argument hopefully will have to be changed to the
|
|
real size of the user-level sigset_t. */
|
|
int result = do_sigtimedwait (set, info, timeout);
|
|
|
|
LIBC_CANCEL_RESET (oldtype);
|
|
|
|
return result;
|
|
}
|
|
libc_hidden_def (__sigtimedwait)
|
|
weak_alias (__sigtimedwait, sigtimedwait)
|
|
#else
|
|
# include <signal/sigtimedwait.c>
|
|
#endif
|