freebsd-dev/lib/libthr/thread/thr_sig.c
Mike Makonnen 8c18819a81 Don't wake up the thread after the signal handler
has been executed. On return from the signal handler
the call will either be restarted or EINTR will be returned,
but it will not go back to its previous state. So, it is
sufficient to simply change the state to 'running' without
actually trying to wake up the thread.
2004-02-19 13:47:12 +00:00

183 lines
4.5 KiB
C

/*
* Copyright (c) 2003 Jeffrey Roberson <jeff@freebsd.org>
* Copyright (c) 2003 Jonathan Mini <mini@freebsd.org>
* 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 unmodified, 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.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 <sys/param.h>
#include <sys/types.h>
#include <sys/signalvar.h>
#include <signal.h>
#include <fcntl.h>
#include <unistd.h>
#include <setjmp.h>
#include <errno.h>
#include <pthread.h>
#include <stdlib.h>
#include "thr_private.h"
/* #define DEBUG_SIGNAL */
#ifdef DEBUG_SIGNAL
#define DBG_MSG stdout_debug
#else
#define DBG_MSG(x...)
#endif
__weak_reference(_sigprocmask, sigprocmask);
int
_sigprocmask(int how, const sigset_t *set, sigset_t *oset)
{
sigset_t new;
/*
* Make sure applications can't unblock our synchronization
* signal. We always want to take this with sigwait().
*/
if (set != NULL) {
new = *set;
switch (how) {
case SIG_BLOCK:
case SIG_SETMASK:
SIGADDSET(new, SIGTHR);
break;
case SIG_UNBLOCK:
SIGDELSET(new, SIGTHR);
break;
default:
break;
}
set = &new;
}
return (__sys_sigprocmask(how, set, oset));
}
__weak_reference(_pthread_sigmask, pthread_sigmask);
int
_pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
{
int error;
/*
* This always sets the mask on the current thread.
*/
error = sigprocmask(how, set, oset);
/*
* pthread_sigmask returns errno or success while sigprocmask returns
* -1 and sets errno.
*/
if (error == -1)
error = errno;
return (error);
}
__weak_reference(_pthread_kill, pthread_kill);
int
_pthread_kill(pthread_t pthread, int sig)
{
if (_thread_initial == NULL)
_thread_init();
return (thr_kill(pthread->thr_id, sig));
}
/*
* User thread signal handler wrapper.
*/
void
_thread_sig_wrapper(int sig, siginfo_t *info, void *context)
{
struct pthread_state_data psd;
struct sigaction *actp;
__siginfohandler_t *handler;
struct umtx *up;
spinlock_t *sp;
/*
* Do a little cleanup handling for those threads in
* queues before calling the signal handler. Signals
* for these threads are temporarily blocked until
* after cleanup handling.
*/
switch (curthread->state) {
case PS_COND_WAIT:
/*
* Cache the address, since it will not be available
* after it has been backed out.
*/
up = &curthread->data.cond->c_lock;
UMTX_LOCK(up);
_thread_critical_enter(curthread);
_cond_wait_backout(curthread);
UMTX_UNLOCK(up);
break;
case PS_MUTEX_WAIT:
/*
* Cache the address, since it will not be available
* after it has been backed out.
*/
sp = &curthread->data.mutex->lock;
_SPINLOCK(sp);
_thread_critical_enter(curthread);
_mutex_lock_backout(curthread);
_SPINUNLOCK(sp);
break;
default:
/*
* We need to lock the thread to read it's flags.
*/
_thread_critical_enter(curthread);
break;
}
/*
* We save the flags now so that any modifications done as part
* of the backout are reflected when the flags are restored.
*/
psd.psd_flags = curthread->flags;
PTHREAD_SET_STATE(curthread, PS_RUNNING);
_thread_critical_exit(curthread);
actp = proc_sigact_sigaction(sig);
handler = (__siginfohandler_t *)actp->sa_handler;
handler(sig, info, (ucontext_t *)context);
/* Restore the thread's flags, and make it runnable */
_thread_critical_enter(curthread);
curthread->flags = psd.psd_flags;
PTHREAD_SET_STATE(curthread, PS_RUNNING);
_thread_critical_exit(curthread);
}