#include "alloc.h"
#include "dynbind.h"
#include "interr.h"
+#include "pseudo-atomic.h"
#include "genesis/fdefn.h"
#include "genesis/simple-fun.h"
#include "genesis/cons.h"
siginfo_t *info,
os_context_t *context);
+static void
+fill_current_sigmask(sigset_t *sigset)
+{
+ /* Get the current sigmask, by blocking the empty set. */
+ sigset_t empty;
+ sigemptyset(&empty);
+ thread_sigmask(SIG_BLOCK, &empty, sigset);
+}
+
void
sigaddset_deferrable(sigset_t *s)
{
sigaddset(s, SIGHUP);
sigaddset(s, SIGINT);
+ sigaddset(s, SIGTERM);
sigaddset(s, SIGQUIT);
sigaddset(s, SIGPIPE);
sigaddset(s, SIGALRM);
sigaddset(s, SIGTSTP);
sigaddset(s, SIGCHLD);
sigaddset(s, SIGIO);
+#ifndef LISP_FEATURE_HPUX
sigaddset(s, SIGXCPU);
sigaddset(s, SIGXFSZ);
+#endif
sigaddset(s, SIGVTALRM);
sigaddset(s, SIGPROF);
sigaddset(s, SIGWINCH);
-#if !((defined(LISP_FEATURE_DARWIN) || defined(LISP_FEATURE_FREEBSD)) && defined(LISP_FEATURE_SB_THREAD))
- sigaddset(s, SIGUSR1);
- sigaddset(s, SIGUSR2);
-#endif
-
#ifdef LISP_FEATURE_SB_THREAD
sigaddset(s, SIG_INTERRUPT_THREAD);
#endif
}
void
-sigaddset_blockable(sigset_t *s)
+sigaddset_blockable(sigset_t *sigset)
+{
+ sigaddset_deferrable(sigset);
+ sigaddset_gc(sigset);
+}
+
+void
+sigaddset_gc(sigset_t *sigset)
{
- sigaddset_deferrable(s);
#ifdef LISP_FEATURE_SB_THREAD
-#ifdef SIG_RESUME_FROM_GC
- sigaddset(s, SIG_RESUME_FROM_GC);
-#endif
- sigaddset(s, SIG_STOP_FOR_GC);
+ sigaddset(sigset,SIG_STOP_FOR_GC);
#endif
}
/* initialized in interrupt_init */
-static sigset_t deferrable_sigset;
-static sigset_t blockable_sigset;
+sigset_t deferrable_sigset;
+sigset_t blockable_sigset;
+sigset_t gc_sigset;
+#endif
+
+void
+check_deferrables_unblocked_in_sigset_or_lose(sigset_t *sigset)
+{
+#if !defined(LISP_FEATURE_WIN32)
+ int i;
+ for(i = 1; i < NSIG; i++) {
+ if (sigismember(&deferrable_sigset, i) && sigismember(sigset, i))
+ lose("deferrable signal %d blocked\n",i);
+ }
+#endif
+}
+
+void
+check_deferrables_blocked_in_sigset_or_lose(sigset_t *sigset)
+{
+#if !defined(LISP_FEATURE_WIN32)
+ int i;
+ for(i = 1; i < NSIG; i++) {
+ if (sigismember(&deferrable_sigset, i) && !sigismember(sigset, i))
+ lose("deferrable signal %d not blocked\n",i);
+ }
+#endif
+}
+
+void
+check_deferrables_blocked_or_lose(void)
+{
+#if !defined(LISP_FEATURE_WIN32)
+ sigset_t current;
+ fill_current_sigmask(¤t);
+ check_deferrables_blocked_in_sigset_or_lose(¤t);
#endif
+}
void
check_blockables_blocked_or_lose(void)
{
#if !defined(LISP_FEATURE_WIN32)
- /* Get the current sigmask, by blocking the empty set. */
- sigset_t empty,current;
+ sigset_t current;
int i;
- sigemptyset(&empty);
- thread_sigmask(SIG_BLOCK, &empty, ¤t);
+ fill_current_sigmask(¤t);
for(i = 1; i < NSIG; i++) {
if (sigismember(&blockable_sigset, i) && !sigismember(¤t, i))
lose("blockable signal %d not blocked\n",i);
}
void
-check_gc_signals_unblocked_or_lose(void)
+check_gc_signals_unblocked_in_sigset_or_lose(sigset_t *sigset)
{
-#ifdef LISP_FEATURE_SB_THREAD
-# if !defined(LISP_FEATURE_WIN32)
- /* Get the current sigmask, by blocking the empty set. */
- sigset_t empty,current;
- sigemptyset(&empty);
- thread_sigmask(SIG_BLOCK, &empty, ¤t);
- if (sigismember(¤t, SIG_STOP_FOR_GC))
- lose("SIG_STOP_FOR_GC blocked in thread %p at a bad place\n",
- arch_os_get_current_thread());
-# if defined(SIG_RESUME_FROM_GC)
- if (sigismember(¤t, SIG_RESUME_FROM_GC))
- lose("SIG_RESUME_FROM_GC blocked in thread %p at a bad place\n",
- arch_os_get_current_thread());
-# endif
-# endif
+#if !defined(LISP_FEATURE_WIN32)
+ int i;
+ for(i = 1; i < NSIG; i++) {
+ if (sigismember(&gc_sigset, i) && sigismember(sigset, i))
+ lose("gc signal %d blocked\n",i);
+ }
#endif
}
void
-unblock_gc_signals(void)
+check_gc_signals_unblocked_or_lose(void)
{
-#ifdef LISP_FEATURE_SB_THREAD
- sigset_t new;
- sigemptyset(&new);
-#if defined(SIG_RESUME_FROM_GC)
- sigaddset(&new,SIG_RESUME_FROM_GC);
-#endif
- sigaddset(&new,SIG_STOP_FOR_GC);
- thread_sigmask(SIG_UNBLOCK,&new,0);
+#if !defined(LISP_FEATURE_WIN32)
+ sigset_t current;
+ fill_current_sigmask(¤t);
+ check_gc_signals_unblocked_in_sigset_or_lose(¤t);
#endif
}
struct thread *thread=arch_os_get_current_thread();
if (SymbolValue(INTERRUPTS_ENABLED,thread) == NIL)
lose("interrupts not enabled\n");
- if (
-#ifdef FOREIGN_FUNCTION_CALL_FLAG
- (!foreign_function_call_active) &&
-#endif
- arch_pseudo_atomic_atomic(context))
+ if (arch_pseudo_atomic_atomic(context))
lose ("in pseudo atomic section\n");
}
+/* Are we leaving WITH-GCING and already running with interrupts
+ * enabled, without the protection of *GC-INHIBIT* T and there is gc
+ * (or stop for gc) pending, but we haven't trapped yet? */
+int
+in_leaving_without_gcing_race_p(struct thread *thread)
+{
+ return ((SymbolValue(IN_WITHOUT_GCING,thread) != NIL) &&
+ (SymbolValue(INTERRUPTS_ENABLED,thread) != NIL) &&
+ (SymbolValue(GC_INHIBIT,thread) == NIL) &&
+ ((SymbolValue(GC_PENDING,thread) != NIL)
+#if defined(LISP_FEATURE_SB_THREAD)
+ || (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL)
+#endif
+ ));
+}
+
+/* Check our baroque invariants. */
+void
+check_interrupt_context_or_lose(os_context_t *context)
+{
+ struct thread *thread = arch_os_get_current_thread();
+ struct interrupt_data *data = thread->interrupt_data;
+ int interrupt_deferred_p = (data->pending_handler != 0);
+ int interrupt_pending = (SymbolValue(INTERRUPT_PENDING,thread) != NIL);
+ /* On PPC pseudo_atomic_interrupted is cleared when coming out of
+ * handle_allocation_trap. */
+#if defined(LISP_FEATURE_GENCGC) && !defined(LISP_FEATURE_PPC)
+#if 0
+ int interrupts_enabled = (SymbolValue(INTERRUPTS_ENABLED,thread) != NIL);
+ int gc_inhibit = (SymbolValue(GC_INHIBIT,thread) != NIL);
+ int gc_pending = (SymbolValue(GC_PENDING,thread) == T);
+ int pseudo_atomic_interrupted = get_pseudo_atomic_interrupted(thread);
+ int in_race_p = in_leaving_without_gcing_race_p(thread);
+#endif
+ /* In the time window between leaving the *INTERRUPTS-ENABLED* NIL
+ * section and trapping, a SIG_STOP_FOR_GC would see the next
+ * check fail, for this reason sig_stop_for_gc handler does not
+ * call this function. Plus, there may be interrupt lossage when a
+ * pseudo atomic is interrupted by a deferrable signal and gc is
+ * triggered, too. */
+#if 0
+ if (interrupt_deferred_p)
+ if (!(!interrupts_enabled || pseudo_atomic_interrupted || in_race_p))
+ lose("Stray deferred interrupt.");
+#endif
+#if 0
+ if (gc_pending)
+ if (!(pseudo_atomic_interrupted || gc_inhibit || in_race_p))
+ lose("GC_PENDING, but why?.");
+#if defined(LISP_FEATURE_SB_THREAD)
+ {
+ int stop_for_gc_pending =
+ (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL);
+ if (stop_for_gc_pending)
+ if (!(pseudo_atomic_interrupted || gc_inhibit || in_race_p))
+ lose("STOP_FOR_GC_PENDING, but why?.");
+ }
+#endif
+#endif
+#endif
+ if (interrupt_pending && !interrupt_deferred_p)
+ lose("INTERRUPT_PENDING but not pending handler.");
+ if (interrupt_deferred_p)
+ check_deferrables_blocked_in_sigset_or_lose
+ (os_context_sigmask_addr(context));
+ else
+ check_deferrables_unblocked_in_sigset_or_lose
+ (os_context_sigmask_addr(context));
+}
+
/* When we catch an internal error, should we pass it back to Lisp to
* be handled in a high-level way? (Early in cold init, the answer is
* 'no', because Lisp is still too brain-dead to handle anything.
#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)
+block_blockable_signals(void)
{
#ifndef LISP_FEATURE_WIN32
- sigset_t new;
- sigemptyset(&new);
- thread_sigmask(SIG_SETMASK,&new,0);
+ thread_sigmask(SIG_BLOCK, &blockable_sigset, 0);
#endif
}
void
-block_blockable_signals(void)
+block_deferrable_signals(void)
{
#ifndef LISP_FEATURE_WIN32
- thread_sigmask(SIG_BLOCK, &blockable_sigset, 0);
+ thread_sigmask(SIG_BLOCK, &deferrable_sigset, 0);
#endif
}
void
-block_deferrable_signals(void)
+unblock_deferrable_signals(void)
{
#ifndef LISP_FEATURE_WIN32
- thread_sigmask(SIG_BLOCK, &deferrable_sigset, 0);
+ thread_sigmask(SIG_UNBLOCK, &deferrable_sigset, 0);
+#endif
+}
+
+void
+unblock_gc_signals(void)
+{
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_WIN32)
+ thread_sigmask(SIG_UNBLOCK,&gc_sigset,0);
#endif
}
dynamic_space_free_pointer =
(lispobj *)(unsigned long)
(*os_context_register_addr(context, reg_ALLOC));
- /* fprintf(stderr,"dynamic_space_free_pointer: %p\n", dynamic_space_free_pointer); */
-#if defined(LISP_FEATURE_ALPHA)
+/* fprintf(stderr,"dynamic_space_free_pointer: %p\n", */
+/* dynamic_space_free_pointer); */
+#if defined(LISP_FEATURE_ALPHA) || defined(LISP_FEATURE_MIPS)
if ((long)dynamic_space_free_pointer & 1) {
lose("dead in fake_foreign_function_call, context = %x\n", context);
}
#endif
+/* why doesnt PPC and SPARC do something like this: */
+#if defined(LISP_FEATURE_HPPA)
+ if ((long)dynamic_space_free_pointer & 4) {
+ lose("dead in fake_foreign_function_call, context = %x, d_s_f_p = %x\n", context, dynamic_space_free_pointer);
+ }
+#endif
#endif
#ifdef reg_BSP
current_binding_stack_pointer =
| (*os_context_register_addr(context, reg_ALLOC)
& LOWTAG_MASK);
/*
- ((unsigned long)(*os_context_register_addr(context, reg_ALLOC)) & ~LOWTAG_MASK)
+ ((unsigned long)(*os_context_register_addr(context, reg_ALLOC))
+ & ~LOWTAG_MASK)
| ((unsigned long) dynamic_space_free_pointer & LOWTAG_MASK);
*/
#endif
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
+#if defined(LISP_FEATURE_LINUX) && defined(LISP_FEATURE_MIPS)
+ /* Workaround for blocked SIGTRAP. */
+ {
+ sigset_t newset;
+ sigemptyset(&newset);
+ sigaddset(&newset, SIGTRAP);
+ thread_sigmask(SIG_UNBLOCK, &newset, 0);
+ }
+#endif
+
SHOW("in interrupt_internal_error");
#ifdef QSHOW
/* Display some rudimentary debugging information about the
* confused, we have a chance to determine what's going on. */
describe_internal_error(context);
#endif
- funcall2(SymbolFunction(INTERNAL_ERROR), context_sap,
+ funcall2(StaticSymbolFunction(INTERNAL_ERROR), context_sap,
continuable ? T : NIL);
undo_fake_foreign_function_call(context); /* blocks signals again */
arch_skip_instruction(context);
}
+boolean
+interrupt_handler_pending_p(void)
+{
+ struct thread *thread = arch_os_get_current_thread();
+ struct interrupt_data *data = thread->interrupt_data;
+ return (data->pending_handler != 0);
+}
+
void
interrupt_handle_pending(os_context_t *context)
{
- /* There are three ways we can get here. First, if an interrupt
+ /* There are three ways we can get here. First, if an interrupt
* occurs within pseudo-atomic, it will be deferred, and we'll
- * trap to here at the end of the pseudo-atomic block. Second, if
+ * trap to here at the end of the pseudo-atomic block. Second, if
* the GC (in alloc()) decides that a GC is required, it will set
- * *GC-PENDING* and pseudo-atomic-interrupted, and alloc() is
- * always called from within pseudo-atomic, and thus we end up
- * here again. Third, when calling GC-ON or at the end of a
- * WITHOUT-GCING, MAYBE-HANDLE-PENDING-GC will trap to here if
- * there is a pending GC. */
+ * *GC-PENDING* and pseudo-atomic-interrupted if not *GC-INHIBIT*,
+ * and alloc() is always called from within pseudo-atomic, and
+ * thus we end up here again. Third, when calling GC-ON or at the
+ * end of a WITHOUT-GCING, MAYBE-HANDLE-PENDING-GC will trap to
+ * here if there is a pending GC. Fourth, ahem, at the end of
+ * WITHOUT-INTERRUPTS (bar complications with nesting). */
/* Win32 only needs to handle the GC cases (for now?) */
- struct thread *thread = arch_os_get_current_thread();
+ struct thread *thread;
+
+ if (arch_pseudo_atomic_atomic(context)) {
+ lose("Handling pending interrupt in pseduo atomic.");
+ }
+
+ thread = arch_os_get_current_thread();
FSHOW_SIGNAL((stderr, "/entering interrupt_handle_pending\n"));
if (SymbolValue(GC_INHIBIT,thread)==NIL) {
#ifdef LISP_FEATURE_SB_THREAD
if (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL) {
- /* another thread has already initiated a gc, this attempt
- * might as well be cancelled */
- SetSymbolValue(GC_PENDING,NIL,thread);
- SetSymbolValue(STOP_FOR_GC_PENDING,NIL,thread);
+ /* STOP_FOR_GC_PENDING and GC_PENDING are cleared by
+ * the signal handler if it actually stops us. */
sig_stop_for_gc_handler(SIG_STOP_FOR_GC,NULL,context);
} else
#endif
- if (SymbolValue(GC_PENDING,thread) != NIL) {
+ /* Test for T and not for != NIL since the value :IN-PROGRESS
+ * is used in SUB-GC as part of the mechanism to supress
+ * recursive gcs.*/
+ if (SymbolValue(GC_PENDING,thread) == T) {
/* GC_PENDING is cleared in SUB-GC, or if another thread
* is doing a gc already we will get a SIG_STOP_FOR_GC and
* that will clear it. */
#ifndef LISP_FEATURE_WIN32
/* we may be here only to do the gc stuff, if interrupts are
* enabled run the pending handler */
- if (!((SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) ||
- (
-#ifdef FOREIGN_FUNCTION_CALL_FLAG
- (!foreign_function_call_active) &&
-#endif
- arch_pseudo_atomic_atomic(context)))) {
+ if (SymbolValue(INTERRUPTS_ENABLED,thread) != NIL) {
struct interrupt_data *data = thread->interrupt_data;
/* There may be no pending handler, because it was only a gc
* that had to be executed or because pseudo atomic triggered
* twice for a single interrupt. For the interested reader,
* that may happen if an interrupt hits after the interrupted
- * flag is cleared but before pseduo-atomic is set and a
+ * flag is cleared but before pseudo-atomic is set and a
* pseudo atomic is interrupted in that interrupt. */
if (data->pending_handler) {
* to WITHOUT-INTERRUPTS, then INTERRUPT_PENDING is already
* NIL, because maybe_defer_handler sets
* PSEUDO_ATOMIC_INTERRUPTED only if interrupts are enabled.*/
- SetSymbolValue(INTERRUPT_PENDING, NIL,thread);
+ SetSymbolValue(INTERRUPT_PENDING, NIL, thread);
/* restore the saved signal mask from the original signal (the
* one that interrupted us during the critical section) into the
* blocked signals are unblocked */
sigcopyset(os_context_sigmask_addr(context), &data->pending_mask);
- sigemptyset(&data->pending_mask);
/* This will break on sparc linux: the deferred handler really wants
* to be called with a void_context */
run_deferred_handler(data,(void *)context);
* already; we're just doing the Lisp-level processing now that we
* put off then */
static void
-run_deferred_handler(struct interrupt_data *data, void *v_context) {
+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 before calling it. Trust the handler to finish
if (SymbolValue(INTERRUPT_PENDING,thread) != NIL)
lose("interrupt already pending\n");
+ check_interrupt_context_or_lose(context);
/* 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.
+ *
+ * Also, if in_leaving_without_gcing_race_p then
+ * interrupt_handle_pending is going to be called soon, so
+ * stashing the signal away is safe.
*/
- if (SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) {
+ if ((SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) ||
+ in_leaving_without_gcing_race_p(thread)) {
store_signal_data_for_later(data,handler,signal,info,context);
SetSymbolValue(INTERRUPT_PENDING, T,thread);
FSHOW_SIGNAL((stderr,
- "/maybe_defer_handler(%x,%d),thread=%lu: deferred\n",
- (unsigned int)handler,signal,
- (unsigned long)thread->os_thread));
+ "/maybe_defer_handler(%x,%d): deferred\n",
+ (unsigned int)handler,signal));
+ check_interrupt_context_or_lose(context);
return 1;
}
- /* a slightly confusing test. arch_pseudo_atomic_atomic() doesn't
+ /* a slightly confusing test. arch_pseudo_atomic_atomic() doesn't
* actually use its argument for anything on x86, so this branch
* may succeed even when context is null (gencgc alloc()) */
- if (
-#ifdef FOREIGN_FUNCTION_CALL_FLAG
- /* FIXME: this foreign_function_call_active test is dubious at
- * best. If a foreign call is made in a pseudo atomic section
- * (?) or more likely a pseudo atomic section is in a foreign
- * call then an interrupt is executed immediately. Maybe it
- * has to do with C code not maintaining pseudo atomic
- * properly. MG - 2005-08-10 */
- (!foreign_function_call_active) &&
-#endif
- arch_pseudo_atomic_atomic(context)) {
+ if (arch_pseudo_atomic_atomic(context)) {
store_signal_data_for_later(data,handler,signal,info,context);
arch_set_pseudo_atomic_interrupted(context);
FSHOW_SIGNAL((stderr,
- "/maybe_defer_handler(%x,%d),thread=%lu: deferred(PA)\n",
- (unsigned int)handler,signal,
- (unsigned long)thread->os_thread));
+ "/maybe_defer_handler(%x,%d): deferred(PA)\n",
+ (unsigned int)handler,signal));
+ check_interrupt_context_or_lose(context);
return 1;
}
FSHOW_SIGNAL((stderr,
- "/maybe_defer_handler(%x,%d),thread=%lu: not deferred\n",
- (unsigned int)handler,signal,
- (unsigned long)thread->os_thread));
+ "/maybe_defer_handler(%x,%d): not deferred\n",
+ (unsigned int)handler,signal));
return 0;
}
if(info)
memcpy(&(data->pending_info), info, sizeof(siginfo_t));
- FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n", signal));
+ FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n",
+ signal));
if(context) {
/* the signal mask in the context (from before we were
if(!maybe_defer_handler(interrupt_handle_now,data,signal,info,context))
interrupt_handle_now(signal, info, context);
-
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
}
static void
-low_level_interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context)
+low_level_interrupt_handle_now(int signal, siginfo_t *info,
+ os_context_t *context)
{
/* No FP control fixage needed, caller has done that. */
check_blockables_blocked_or_lose();
check_interrupts_enabled_or_lose(context);
- interrupt_low_level_handlers[signal](signal, info, context);
+ (*interrupt_low_level_handlers[signal])(signal, info, context);
/* No Darwin context fixage needed, caller does that. */
}
if(!maybe_defer_handler(low_level_interrupt_handle_now,data,
signal,info,context))
low_level_interrupt_handle_now(signal, info, context);
-
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
-#endif
}
#endif
struct thread *thread=arch_os_get_current_thread();
sigset_t ss;
- if ((arch_pseudo_atomic_atomic(context) ||
- SymbolValue(GC_INHIBIT,thread) != NIL)) {
+ /* Test for GC_INHIBIT _first_, else we'd trap on every single
+ * pseudo atomic until gc is finally allowed. */
+ if (SymbolValue(GC_INHIBIT,thread) != NIL) {
SetSymbolValue(STOP_FOR_GC_PENDING,T,thread);
- if (SymbolValue(GC_INHIBIT,thread) == NIL)
- arch_set_pseudo_atomic_interrupted(context);
- FSHOW_SIGNAL((stderr,"thread=%lu sig_stop_for_gc deferred\n",
- thread->os_thread));
- } else {
- /* need the context stored so it can have registers scavenged */
- fake_foreign_function_call(context);
+ FSHOW_SIGNAL((stderr, "sig_stop_for_gc deferred (*GC-INHIBIT*)\n"));
+ return;
+ } else if (arch_pseudo_atomic_atomic(context)) {
+ SetSymbolValue(STOP_FOR_GC_PENDING,T,thread);
+ arch_set_pseudo_atomic_interrupted(context);
+ FSHOW_SIGNAL((stderr,"sig_stop_for_gc deferred (PA)\n"));
+ return;
+ }
- sigfillset(&ss); /* Block everything. */
- thread_sigmask(SIG_BLOCK,&ss,0);
+ /* Not PA and GC not inhibited -- we can stop now. */
- if(thread->state!=STATE_RUNNING) {
- lose("sig_stop_for_gc_handler: wrong thread state: %ld\n",
- fixnum_value(thread->state));
- }
- thread->state=STATE_SUSPENDED;
- FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread));
+ /* need the context stored so it can have registers scavenged */
+ fake_foreign_function_call(context);
-#if defined(SIG_RESUME_FROM_GC)
- sigemptyset(&ss); sigaddset(&ss,SIG_RESUME_FROM_GC);
-#else
- sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC);
-#endif
+ /* Block everything. */
+ sigfillset(&ss);
+ thread_sigmask(SIG_BLOCK,&ss,0);
- /* It is possible to get SIGCONT (and probably other
- * non-blockable signals) here. */
-#ifdef SIG_RESUME_FROM_GC
- {
- int sigret;
- do { sigwait(&ss, &sigret); }
- while (sigret != SIG_RESUME_FROM_GC);
- }
-#else
- while (sigwaitinfo(&ss,0) != SIG_STOP_FOR_GC);
-#endif
+ /* Not pending anymore. */
+ SetSymbolValue(GC_PENDING,NIL,thread);
+ SetSymbolValue(STOP_FOR_GC_PENDING,NIL,thread);
- 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",
- fixnum_value(thread->state));
- }
+ if(thread_state(thread)!=STATE_RUNNING) {
+ lose("sig_stop_for_gc_handler: wrong thread state: %ld\n",
+ fixnum_value(thread->state));
+ }
+
+ set_thread_state(thread,STATE_SUSPENDED);
+ FSHOW_SIGNAL((stderr,"suspended\n"));
- undo_fake_foreign_function_call(context);
+ wait_for_thread_state_change(thread, STATE_SUSPENDED);
+ FSHOW_SIGNAL((stderr,"resumed\n"));
+
+ if(thread_state(thread)!=STATE_RUNNING) {
+ lose("sig_stop_for_gc_handler: wrong thread state on wakeup: %ld\n",
+ fixnum_value(thread_state(thread)));
}
+
+ undo_fake_foreign_function_call(context);
}
+
#endif
void
os_context_t *context = arch_os_get_context(&void_context);
#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT)
os_restore_fp_control(context);
+#ifndef LISP_FEATURE_WIN32
+ if ((signal == SIGILL) || (signal == SIGBUS)
+#ifndef LISP_FEATURE_LINUX
+ || (signal == SIGEMT)
#endif
- interrupt_handle_now(signal, info, context);
-#ifdef LISP_FEATURE_DARWIN
- DARWIN_FIX_CONTEXT(context);
+ )
+ corruption_warning_and_maybe_lose("Signal %d recieved", signal);
#endif
-}
-
-/*
- * stuff to detect and handle hitting the GC trigger
- */
-
-#ifndef LISP_FEATURE_GENCGC
#endif
+ interrupt_handle_now(signal, info, context);
+}
/* manipulate the signal context and stack such that when the handler
* returns, it will call function instead of whatever it was doing
*(register_save_area + 7) = *os_context_register_addr(context,reg_EAX);
*(register_save_area + 8) = *context_eflags_addr(context);
- *os_context_pc_addr(context) = call_into_lisp_tramp;
- *os_context_register_addr(context,reg_ECX) = register_save_area;
+ *os_context_pc_addr(context) =
+ (os_context_register_t) call_into_lisp_tramp;
+ *os_context_register_addr(context,reg_ECX) =
+ (os_context_register_t) register_save_area;
#else
/* return address for call_into_lisp: */
*os_context_register_addr(context,reg_CODE) =
(os_context_register_t)(fun + FUN_POINTER_LOWTAG);
#endif
+ FSHOW((stderr, "/arranged return to Lisp function (0x%lx)\n",
+ (long)function));
}
#ifdef LISP_FEATURE_SB_THREAD
{
os_context_t *context = (os_context_t*)arch_os_get_context(&v_context);
+ FSHOW_SIGNAL((stderr,"/interrupt_thread_handler\n"));
+ check_blockables_blocked_or_lose();
+
/* 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));
+ arrange_return_to_lisp_function(context,
+ StaticSymbolFunction(RUN_INTERRUPTION));
}
#endif
* functions and variables.
*/
void
-undefined_alien_function() {
- funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR));
+undefined_alien_function(void)
+{
+ funcall0(StaticSymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR));
}
boolean
* protection so the error handler has some headroom, protect the
* previous page so that we can catch returns from the guard page
* and restore it. */
+ corruption_warning_and_maybe_lose("Control stack exhausted");
protect_control_stack_guard_page(0);
protect_control_stack_return_guard_page(1);
arrange_return_to_lisp_function
- (context, SymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR));
+ (context, StaticSymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR));
return 1;
}
else if(addr >= CONTROL_STACK_RETURN_GUARD_PAGE(th) &&
else if (addr >= undefined_alien_address &&
addr < undefined_alien_address + os_vm_page_size) {
arrange_return_to_lisp_function
- (context, SymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR));
+ (context, StaticSymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR));
return 1;
}
else return 0;
}
static void
-see_if_sigaction_nodefer_works()
+see_if_sigaction_nodefer_works(void)
{
struct sigaction sa, old_sa;
void
undoably_install_low_level_interrupt_handler (int signal,
- void handler(int,
- siginfo_t*,
- void*))
+ interrupt_handler_t handler)
{
struct sigaction sa;
| (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
#endif
}
+/* This must not go through lisp as it's allowed anytime, even when on
+ * the altstack. */
+void
+sigabrt_handler(int signal, siginfo_t *info, void *void_context)
+{
+ lose("SIGABRT received.\n");
+}
+
void
-interrupt_init()
+interrupt_init(void)
{
#ifndef LISP_FEATURE_WIN32
int i;
see_if_sigaction_nodefer_works();
sigemptyset(&deferrable_sigset);
sigemptyset(&blockable_sigset);
+ sigemptyset(&gc_sigset);
sigaddset_deferrable(&deferrable_sigset);
sigaddset_blockable(&blockable_sigset);
+ sigaddset_gc(&gc_sigset);
/* Set up high level handler information. */
for (i = 0; i < NSIG; i++) {
* 3-argument form is expected.) */
(void (*)(int, siginfo_t*, void*))SIG_DFL;
}
-
+ undoably_install_low_level_interrupt_handler(SIGABRT, sigabrt_handler);
SHOW("returning from interrupt_init()");
#endif
}
lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr)
{
/* FIXME: This is lossy: if we get another memory fault (eg. from
- * another thread) before lisp has read this, we the information.
+ * another thread) before lisp has read this, we lose the information.
* However, since this is mostly informative, we'll live with that for
* now -- some address is better then no address in this case.
*/
current_memory_fault_address = addr;
- arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
+ /* To allow debugging memory faults in signal handlers and such. */
+ corruption_warning_and_maybe_lose("Memory fault");
+ arrange_return_to_lisp_function(context,
+ StaticSymbolFunction(MEMORY_FAULT_ERROR));
}
#endif
-void
+static void
unhandled_trap_error(os_context_t *context)
{
lispobj context_sap;
#ifndef LISP_FEATURE_WIN32
thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
#endif
- funcall1(SymbolFunction(UNHANDLED_TRAP_ERROR), context_sap);
+ funcall1(StaticSymbolFunction(UNHANDLED_TRAP_ERROR), context_sap);
lose("UNHANDLED-TRAP-ERROR fell through");
}
-/* Common logic far trapping instructions. How we actually handle each
- * case is highly architecture dependant, but the overall shape is
+/* Common logic for trapping instructions. How we actually handle each
+ * case is highly architecture dependent, but the overall shape is
* this. */
void
handle_trap(os_context_t *context, int trap)
unhandled_trap_error(context);
}
}
-
projects / sbcl.git / blobdiff