*
* - WHN 20000728, dan 20010128 */
+#include "sbcl.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <sys/types.h>
+#ifndef LISP_FEATURE_WIN32
#include <sys/wait.h>
+#endif
#include <errno.h>
-#include "sbcl.h"
#include "runtime.h"
#include "arch.h"
#include "os.h"
-void run_deferred_handler(struct interrupt_data *data, void *v_context) ;
+static void run_deferred_handler(struct interrupt_data *data, void *v_context);
+#ifndef LISP_FEATURE_WIN32
static void store_signal_data_for_later (struct interrupt_data *data,
void *handler, int signal,
siginfo_t *info,
os_context_t *context);
boolean interrupt_maybe_gc_int(int signal, siginfo_t *info, void *v_context);
-void sigaddset_deferrable(sigset_t *s)
+void
+sigaddset_deferrable(sigset_t *s)
{
sigaddset(s, SIGHUP);
sigaddset(s, SIGINT);
#endif
}
-void sigaddset_blockable(sigset_t *s)
+void
+sigaddset_blockable(sigset_t *s)
{
sigaddset_deferrable(s);
#ifdef LISP_FEATURE_SB_THREAD
/* initialized in interrupt_init */
static sigset_t deferrable_sigset;
static sigset_t blockable_sigset;
+#endif
-inline static void check_blockables_blocked_or_lose()
+void
+check_blockables_blocked_or_lose()
{
+#ifndef LISP_FEATURE_WIN32
/* Get the current sigmask, by blocking the empty set. */
sigset_t empty,current;
int i;
sigemptyset(&empty);
thread_sigmask(SIG_BLOCK, &empty, ¤t);
- for(i=0;i<NSIG;i++) {
+ for(i = 1; i < NSIG; i++) {
if (sigismember(&blockable_sigset, i) && !sigismember(¤t, i))
- lose("blockable signal %d not blocked",i);
+ lose("blockable signal %d not blocked\n",i);
}
+#endif
}
-inline static void check_interrupts_enabled_or_lose(os_context_t *context)
+inline static void
+check_interrupts_enabled_or_lose(os_context_t *context)
{
struct thread *thread=arch_os_get_current_thread();
if (SymbolValue(INTERRUPTS_ENABLED,thread) == NIL)
- lose("interrupts not enabled");
+ lose("interrupts not enabled\n");
if (
#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
(!foreign_function_call_active) &&
#endif
arch_pseudo_atomic_atomic(context))
- lose ("in pseudo atomic section");
+ lose ("in pseudo atomic section\n");
}
/* When we catch an internal error, should we pass it back to Lisp to
* becomes 'yes'.) */
boolean internal_errors_enabled = 0;
+#ifndef LISP_FEATURE_WIN32
static void (*interrupt_low_level_handlers[NSIG]) (int, siginfo_t*, void*);
+#endif
union interrupt_handler interrupt_handlers[NSIG];
/* At the toplevel repl we routinely call this function. The signal
* mask ought to be clear anyway most of the time, but may be non-zero
* if we were interrupted e.g. while waiting for a queue. */
-void reset_signal_mask(void)
+void
+reset_signal_mask(void)
{
+#ifndef LISP_FEATURE_WIN32
sigset_t new;
sigemptyset(&new);
thread_sigmask(SIG_SETMASK,&new,0);
+#endif
}
-void block_blockable_signals(void)
+void
+block_blockable_signals(void)
{
- sigset_t block;
- sigcopyset(&block, &blockable_sigset);
- thread_sigmask(SIG_BLOCK, &block, 0);
+#ifndef LISP_FEATURE_WIN32
+ thread_sigmask(SIG_BLOCK, &blockable_sigset, 0);
+#endif
}
\f
#endif
}
+/* Stores the context for gc to scavange and builds fake stack
+ * frames. */
void
fake_foreign_function_call(os_context_t *context)
{
(*os_context_register_addr(context, reg_ALLOC));
#if defined(LISP_FEATURE_ALPHA)
if ((long)dynamic_space_free_pointer & 1) {
- lose("dead in fake_foreign_function_call, context = %x", context);
+ lose("dead in fake_foreign_function_call, context = %x\n", context);
}
#endif
#endif
fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread));
if (context_index >= MAX_INTERRUPTS) {
- lose("maximum interrupt nesting depth (%d) exceeded", MAX_INTERRUPTS);
+ lose("maximum interrupt nesting depth (%d) exceeded\n", MAX_INTERRUPTS);
}
bind_variable(FREE_INTERRUPT_CONTEXT_INDEX,
/* blocks all blockable signals. If you are calling from a signal handler,
* the usual signal mask will be restored from the context when the handler
* finishes. Otherwise, be careful */
-
void
undo_fake_foreign_function_call(os_context_t *context)
{
describe_internal_error(context);
/* There's no good way to recover from an internal error
* before the Lisp error handling mechanism is set up. */
- lose("internal error too early in init, can't recover");
+ lose("internal error too early in init, can't recover\n");
}
/* Allocate the SAP object while the interrupts are still
* disabled. */
context_sap = alloc_sap(context);
+#ifndef LISP_FEATURE_WIN32
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
SHOW("in interrupt_internal_error");
#ifdef QSHOW
thread=arch_os_get_current_thread();
data=thread->interrupt_data;
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+ /* If pseudo_atomic_interrupted is set then the interrupt is going
+ * to be handled now, ergo it's safe to clear it. */
+ arch_clear_pseudo_atomic_interrupted(context);
+#endif
+
if (SymbolValue(GC_INHIBIT,thread)==NIL) {
#ifdef LISP_FEATURE_SB_THREAD
if (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL) {
* PSEUDO_ATOMIC_INTERRUPTED only if interrupts are enabled.*/
SetSymbolValue(INTERRUPT_PENDING, NIL,thread);
+#ifndef LISP_FEATURE_WIN32
/* restore the saved signal mask from the original signal (the
* one that interrupted us during the critical section) into the
* os_context for the signal we're currently in the handler for.
sigcopyset(os_context_sigmask_addr(context), &data->pending_mask);
sigemptyset(&data->pending_mask);
+#endif
/* This will break on sparc linux: the deferred handler really wants
* to be called with a void_context */
run_deferred_handler(data,(void *)context);
#endif
union interrupt_handler handler;
check_blockables_blocked_or_lose();
+#ifndef LISP_FEATURE_WIN32
if (sigismember(&deferrable_sigset,signal))
check_interrupts_enabled_or_lose(context);
+#endif
#ifdef LISP_FEATURE_LINUX
/* Under Linux on some architectures, we appear to have to restore
/* This can happen if someone tries to ignore or default one
* of the signals we need for runtime support, and the runtime
* support decides to pass on it. */
- lose("no handler for signal %d in interrupt_handle_now(..)", signal);
+ lose("no handler for signal %d in interrupt_handle_now(..)\n", signal);
} else if (lowtag_of(handler.lisp) == FUN_POINTER_LOWTAG) {
/* Once we've decided what to do about contexts in a
* all our allocation from C now goes through a PA wrapper,
* but still, doesn't hurt.
*
- * Yeah, but non-gencgc platforms that don't really wrap
- * allocation in PA. MG - 2005-08-29 */
+ * Yeah, but non-gencgc platforms don't really wrap allocation
+ * in PA. MG - 2005-08-29 */
lispobj info_sap,context_sap = alloc_sap(context);
info_sap = alloc_sap(info);
- /* Allow signals again. */
- thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+ /* Leave deferrable signals blocked, the handler itself will
+ * allow signals again when it sees fit. */
+#ifdef LISP_FEATURE_SB_THREAD
+ {
+ sigset_t unblock;
+ sigemptyset(&unblock);
+ sigaddset(&unblock, SIG_STOP_FOR_GC);
+ thread_sigmask(SIG_UNBLOCK, &unblock, 0);
+ }
+#endif
FSHOW_SIGNAL((stderr,"/calling Lisp-level handler\n"));
FSHOW_SIGNAL((stderr,"/calling C-level handler\n"));
+#ifndef LISP_FEATURE_WIN32
/* Allow signals again. */
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
(*handler.c)(signal, info, void_context);
}
* far as C or the kernel is concerned we dealt with the signal
* already; we're just doing the Lisp-level processing now that we
* put off then */
-
-void
+static void
run_deferred_handler(struct interrupt_data *data, void *v_context) {
/* The pending_handler may enable interrupts and then another
* interrupt may hit, overwrite interrupt_data, so reset the
(*pending_handler)(data->pending_signal,&(data->pending_info), v_context);
}
+#ifndef LISP_FEATURE_WIN32
boolean
maybe_defer_handler(void *handler, struct interrupt_data *data,
int signal, siginfo_t *info, os_context_t *context)
check_blockables_blocked_or_lose();
if (SymbolValue(INTERRUPT_PENDING,thread) != NIL)
- lose("interrupt already pending");
+ lose("interrupt already pending\n");
/* If interrupts are disabled then INTERRUPT_PENDING is set and
* not PSEDUO_ATOMIC_INTERRUPTED. This is important for a pseudo
* atomic section inside a WITHOUT-INTERRUPTS.
DARWIN_FIX_CONTEXT(context);
#endif
}
+#endif
#ifdef LISP_FEATURE_SB_THREAD
sigfillset(&ss); /* Block everything. */
thread_sigmask(SIG_BLOCK,&ss,0);
- /* The GC can't tell if a thread is a zombie, so this would be a
- * good time to let the kernel reap any of our children in that
- * awful state, to stop them from being waited for indefinitely.
- * Userland reaping is done later when GC is finished */
if(thread->state!=STATE_RUNNING) {
lose("sig_stop_for_gc_handler: wrong thread state: %ld\n",
fixnum_value(thread->state));
FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread));
sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC);
- sigwaitinfo(&ss,0);
+ /* It is possible to get SIGCONT (and probably other
+ * non-blockable signals) here. */
+ while (sigwaitinfo(&ss,0) != SIG_STOP_FOR_GC);
FSHOW_SIGNAL((stderr,"thread=%lu resumed\n",thread->os_thread));
if(thread->state!=STATE_RUNNING) {
lose("sig_stop_for_gc_handler: wrong thread state on wakeup: %ld\n",
*/
#if (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-int *context_eflags_addr(os_context_t *context);
+extern int *context_eflags_addr(os_context_t *context);
#endif
extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs);
extern void post_signal_tramp(void);
-void arrange_return_to_lisp_function(os_context_t *context, lispobj function)
+void
+arrange_return_to_lisp_function(os_context_t *context, lispobj function)
{
#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
void * fun=native_pointer(function);
/* FIXME: this function can go away when all lisp handlers are invoked
* via arrange_return_to_lisp_function. */
-void interrupt_thread_handler(int num, siginfo_t *info, void *v_context)
+void
+interrupt_thread_handler(int num, siginfo_t *info, void *v_context)
{
os_context_t *context = (os_context_t*)arch_os_get_context(&v_context);
+ /* let the handler enable interrupts again when it sees fit */
+ sigaddset_deferrable(os_context_sigmask_addr(context));
arrange_return_to_lisp_function(context, SymbolFunction(RUN_INTERRUPTION));
}
* that has the added benefit of automatically discriminating between
* functions and variables.
*/
-void undefined_alien_function() {
+void
+undefined_alien_function() {
funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR));
}
-boolean handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr)
+boolean
+handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr)
{
struct thread *th=arch_os_get_current_thread();
interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context)
{
os_context_t *context=(os_context_t *) void_context;
+#ifndef LISP_FEATURE_WIN32
struct thread *thread=arch_os_get_current_thread();
+#endif
fake_foreign_function_call(context);
* A kludgy alternative is to propagate the sigmask change to the
* outer context.
*/
+#ifndef LISP_FEATURE_WIN32
if(SymbolValue(INTERRUPTS_ENABLED,thread)!=NIL)
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#ifdef LISP_FEATURE_SB_THREAD
else {
sigset_t new;
+ sigemptyset(&new);
sigaddset(&new,SIG_STOP_FOR_GC);
thread_sigmask(SIG_UNBLOCK,&new,0);
}
#endif
+#endif
funcall0(SymbolFunction(SUB_GC));
undo_fake_foreign_function_call(context);
* noise to install handlers
*/
+#ifndef LISP_FEATURE_WIN32
+/* In Linux 2.4 synchronous signals (sigtrap & co) can be delivered if
+ * they are blocked, in Linux 2.6 the default handler is invoked
+ * instead that usually coredumps. One might hastily think that adding
+ * SA_NODEFER helps, but until ~2.6.13 if SA_NODEFER is specified then
+ * the whole sa_mask is ignored and instead of not adding the signal
+ * in question to the mask. That means if it's not blockable the
+ * signal must be unblocked at the beginning of signal handlers.
+ */
+static volatile int sigaction_nodefer_works = -1;
+
+static void
+sigaction_nodefer_test_handler(int signal, siginfo_t *info, void *void_context)
+{
+ sigset_t empty, current;
+ int i;
+ sigemptyset(&empty);
+ sigprocmask(SIG_BLOCK, &empty, ¤t);
+ for(i = 1; i < NSIG; i++)
+ if (sigismember(¤t, i) != ((i == SIGABRT) ? 1 : 0)) {
+ FSHOW_SIGNAL((stderr, "SA_NODEFER doesn't work, signal %d\n", i));
+ sigaction_nodefer_works = 0;
+ }
+ if (sigaction_nodefer_works == -1)
+ sigaction_nodefer_works = 1;
+}
+
+static void
+see_if_sigaction_nodefer_works()
+{
+ struct sigaction sa, old_sa;
+
+ sa.sa_flags = SA_SIGINFO | SA_NODEFER;
+ sa.sa_sigaction = sigaction_nodefer_test_handler;
+ sigemptyset(&sa.sa_mask);
+ sigaddset(&sa.sa_mask, SIGABRT);
+ sigaction(SIGUSR1, &sa, &old_sa);
+ /* Make sure no signals are blocked. */
+ {
+ sigset_t empty;
+ sigemptyset(&empty);
+ sigprocmask(SIG_SETMASK, &empty, 0);
+ }
+ kill(getpid(), SIGUSR1);
+ while (sigaction_nodefer_works == -1);
+ sigaction(SIGUSR1, &old_sa, NULL);
+}
+
+static void
+unblock_me_trampoline(int signal, siginfo_t *info, void *void_context)
+{
+ sigset_t unblock;
+ sigemptyset(&unblock);
+ sigaddset(&unblock, signal);
+ thread_sigmask(SIG_UNBLOCK, &unblock, 0);
+ interrupt_handle_now_handler(signal, info, void_context);
+}
+
+static void
+low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context)
+{
+ sigset_t unblock;
+ sigemptyset(&unblock);
+ sigaddset(&unblock, signal);
+ thread_sigmask(SIG_UNBLOCK, &unblock, 0);
+ (*interrupt_low_level_handlers[signal])(signal, info, void_context);
+}
+
void
undoably_install_low_level_interrupt_handler (int signal,
void handler(int,
struct sigaction sa;
if (0 > signal || signal >= NSIG) {
- lose("bad signal number %d", signal);
+ lose("bad signal number %d\n", signal);
}
- if (sigismember(&deferrable_sigset,signal))
+ if (ARE_SAME_HANDLER(handler, SIG_DFL))
+ sa.sa_sigaction = handler;
+ else if (sigismember(&deferrable_sigset,signal))
sa.sa_sigaction = low_level_maybe_now_maybe_later;
+ else if (!sigaction_nodefer_works &&
+ !sigismember(&blockable_sigset, signal))
+ sa.sa_sigaction = low_level_unblock_me_trampoline;
else
sa.sa_sigaction = handler;
sigcopyset(&sa.sa_mask, &blockable_sigset);
- sa.sa_flags = SA_SIGINFO | SA_RESTART;
+ sa.sa_flags = SA_SIGINFO | SA_RESTART |
+ (sigaction_nodefer_works ? SA_NODEFER : 0);
#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
if((signal==SIG_MEMORY_FAULT)
+#ifdef SIG_MEMORY_FAULT2
+ || (signal==SIG_MEMORY_FAULT2)
+#endif
#ifdef SIG_INTERRUPT_THREAD
|| (signal==SIG_INTERRUPT_THREAD)
#endif
interrupt_low_level_handlers[signal] =
(ARE_SAME_HANDLER(handler, SIG_DFL) ? 0 : handler);
}
+#endif
/* This is called from Lisp. */
unsigned long
install_handler(int signal, void handler(int, siginfo_t*, void*))
{
+#ifndef LISP_FEATURE_WIN32
struct sigaction sa;
sigset_t old, new;
union interrupt_handler oldhandler;
(unsigned int)interrupt_low_level_handlers[signal]));
if (interrupt_low_level_handlers[signal]==0) {
if (ARE_SAME_HANDLER(handler, SIG_DFL) ||
- ARE_SAME_HANDLER(handler, SIG_IGN)) {
+ ARE_SAME_HANDLER(handler, SIG_IGN))
sa.sa_sigaction = handler;
- } else if (sigismember(&deferrable_sigset, signal)) {
+ else if (sigismember(&deferrable_sigset, signal))
sa.sa_sigaction = maybe_now_maybe_later;
- } else {
+ else if (!sigaction_nodefer_works &&
+ !sigismember(&blockable_sigset, signal))
+ sa.sa_sigaction = unblock_me_trampoline;
+ else
sa.sa_sigaction = interrupt_handle_now_handler;
- }
sigcopyset(&sa.sa_mask, &blockable_sigset);
- sa.sa_flags = SA_SIGINFO | SA_RESTART;
+ sa.sa_flags = SA_SIGINFO | SA_RESTART |
+ (sigaction_nodefer_works ? SA_NODEFER : 0);
sigaction(signal, &sa, NULL);
}
FSHOW((stderr, "/leaving POSIX install_handler(%d, ..)\n", signal));
return (unsigned long)oldhandler.lisp;
+#else
+ /* Probably-wrong Win32 hack */
+ return 0;
+#endif
}
void
interrupt_init()
{
+#ifndef LISP_FEATURE_WIN32
int i;
SHOW("entering interrupt_init()");
+ see_if_sigaction_nodefer_works();
sigemptyset(&deferrable_sigset);
sigemptyset(&blockable_sigset);
sigaddset_deferrable(&deferrable_sigset);
}
SHOW("returning from interrupt_init()");
+#endif
}
projects / sbcl.git / blobdiff