1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
* 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.

	returning because seconds==0.  Add __builtin_expect.
This commit is contained in:
Ulrich Drepper
2003-06-17 20:46:06 +00:00
parent 047aec8f19
commit aa3cee213a
5 changed files with 45 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* 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
@ -36,6 +36,18 @@ do_sigwait (const sigset_t *set, int *sig)
{
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