diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/sigsuspend.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/sigsuspend.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/sysdeps/unix/sysv/linux/sigsuspend.c b/sysdeps/unix/sysv/linux/sigsuspend.c index adbdfdd..0cf8d50 100644 --- a/sysdeps/unix/sysv/linux/sigsuspend.c +++ b/sysdeps/unix/sysv/linux/sigsuspend.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2002,2003,2006 - Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003 + 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 @@ -25,7 +25,7 @@ #include <sys/syscall.h> #include <bp-checks.h> -#include <kernel-features.h> +#include "kernel-features.h" #if !__ASSUME_REALTIME_SIGNALS @@ -56,12 +56,6 @@ do_sigsuspend (const sigset_t *set) return INLINE_SYSCALL (sigsuspend, 3, 0, 0, set->__val[0]); } -#else -static inline int __attribute__ ((always_inline)) -do_sigsuspend (const sigset_t *set) -{ - return INLINE_SYSCALL (rt_sigsuspend, 2, CHECK_SIGSET (set), _NSIG / 8); -} #endif /* Change the set of blocked signals to SET, @@ -70,6 +64,19 @@ int __sigsuspend (set) const sigset_t *set; { +#if __ASSUME_REALTIME_SIGNALS + if (SINGLE_THREAD_P) + return INLINE_SYSCALL (rt_sigsuspend, 2, CHECK_SIGSET (set), _NSIG / 8); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = INLINE_SYSCALL (rt_sigsuspend, 2, CHECK_SIGSET (set), + _NSIG / 8); + + LIBC_CANCEL_RESET (oldtype); + + return result; +#else if (SINGLE_THREAD_P) return do_sigsuspend (set); @@ -80,16 +87,8 @@ __sigsuspend (set) LIBC_CANCEL_RESET (oldtype); return result; +#endif } libc_hidden_def (__sigsuspend) weak_alias (__sigsuspend, sigsuspend) strong_alias (__sigsuspend, __libc_sigsuspend) - -#ifndef NO_CANCELLATION -int -__sigsuspend_nocancel (set) - const sigset_t *set; -{ - return do_sigsuspend (set); -} -#endif |