5321c2a9b0
sigsuspend, thread shouldn't wait, in old code, it may be ignored. When a signal handler is invoked in sigsuspend, thread gets two different signal masks, one is in thread structure, sigprocmask() can retrieve it, another is in ucontext which is a third parameter of signal handler, the former is the result of sigsuspend mask ORed with sigaction's sa_mask and current signal, the later is the mask in thread structure before sigsuspend is called. After signal handler is called, the mask in ucontext should be copied into thread structure, and becomes CURRENT signal mask, then sigsuspend returns to user code. Reviewed by: deischen Tested by: Sean McNeil <sean@mcneil.com>
101 lines
3.3 KiB
C
101 lines
3.3 KiB
C
/*
|
|
* Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by John Birrell.
|
|
* 4. Neither the name of the author nor the names of any co-contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
#include <signal.h>
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <string.h>
|
|
#include <sys/signalvar.h>
|
|
#include "thr_private.h"
|
|
|
|
__weak_reference(__sigsuspend, sigsuspend);
|
|
|
|
int
|
|
_sigsuspend(const sigset_t *set)
|
|
{
|
|
struct pthread *curthread = _get_curthread();
|
|
sigset_t oldmask, newmask, tempset;
|
|
int ret = -1;
|
|
|
|
if (curthread->attr.flags & PTHREAD_SCOPE_SYSTEM)
|
|
return (__sys_sigsuspend(set));
|
|
|
|
/* Check if a new signal set was provided by the caller: */
|
|
if (set != NULL) {
|
|
newmask = *set;
|
|
SIG_CANTMASK(newmask);
|
|
THR_LOCK_SWITCH(curthread);
|
|
|
|
/* Save current sigmask: */
|
|
oldmask = curthread->sigmask;
|
|
curthread->oldsigmask = &oldmask;
|
|
|
|
/* Change the caller's mask: */
|
|
curthread->sigmask = newmask;
|
|
tempset = curthread->sigpend;
|
|
SIGSETNAND(tempset, newmask);
|
|
if (SIGISEMPTY(tempset)) {
|
|
THR_SET_STATE(curthread, PS_SIGSUSPEND);
|
|
/* Wait for a signal: */
|
|
_thr_sched_switch_unlocked(curthread);
|
|
} else {
|
|
THR_UNLOCK_SWITCH(curthread);
|
|
/* check pending signal I can handle: */
|
|
_thr_sig_check_pending(curthread);
|
|
}
|
|
THR_ASSERT(curthread->oldsigmask == NULL,
|
|
"oldsigmask is not cleared");
|
|
/* Always return an interrupted error: */
|
|
errno = EINTR;
|
|
} else {
|
|
/* Return an invalid argument error: */
|
|
errno = EINVAL;
|
|
}
|
|
|
|
/* Return the completion status: */
|
|
return (ret);
|
|
}
|
|
|
|
int
|
|
__sigsuspend(const sigset_t * set)
|
|
{
|
|
struct pthread *curthread = _get_curthread();
|
|
int ret;
|
|
|
|
_thr_cancel_enter(curthread);
|
|
ret = _sigsuspend(set);
|
|
_thr_cancel_leave(curthread, 1);
|
|
|
|
return (ret);
|
|
}
|