2003-06-17 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/sigtimedwait.c: If SIGCANCEL is defined
+ and part of the incoming set, create a temporary set without this
+ signal.
+ * sysdeps/unix/sysv/linux/sigwait.c: Likewise.
+ * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
+
* sysdeps/unix/sysv/linux/sleep.c: Use CANCELLATION_P if defined before
- returning because seconds==0.
+ returning because seconds==0. Add __builtin_expect.
2003-06-16 Ulrich Drepper <drepper@redhat.com>
do_sigtimedwait (const sigset_t *set, siginfo_t *info,
const struct timespec *timeout)
{
+#ifdef SIGCANCEL
+ sigset_t tmpset;
+ if (set != NULL && __sigismember (set, SIGCANCEL))
+ {
+ /* 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);
+ 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, CHECK_SIGSET (set),
-/* Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 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
{
int ret;
+#ifdef SIGCANCEL
+ sigset_t tmpset;
+ if (set != NULL && __sigismember (set, SIGCANCEL))
+ {
+ /* 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);
+ set = &tmpset;
+ }
+#endif
+
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
#ifdef INTERNAL_SYSCALL
static int
do_sigwaitinfo (const sigset_t *set, siginfo_t *info)
{
+#ifdef SIGCANCEL
+ sigset_t tmpset;
+ if (set != NULL && __sigismember (set, SIGCANCEL))
+ {
+ /* 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);
+ 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, CHECK_SIGSET (set),
unsigned int result;
/* This is not necessary but some buggy programs depend on this. */
- if (seconds == 0)
+ if (__builtin_expect (seconds == 0, 0))
{
#ifdef CANCELLATION_P
CANCELLATION_P (THREAD_SELF);