X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=00c920e8ee1fa53b9d99836a34aa1fdc51ceed7f;hb=0f234877047c56ca945fe54e9e77a9cc2c8141cb;hp=bc704e389c640bc811f573cf2c0760aca801365d;hpb=6cde30b92d3e6092372d0164bb47b58568d9360f;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index bc704e3..00c920e 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -40,16 +40,18 @@ * * - WHN 20000728, dan 20010128 */ +#include "sbcl.h" #include #include #include #include #include +#ifndef LISP_FEATURE_WIN32 #include +#endif #include -#include "sbcl.h" #include "runtime.h" #include "arch.h" #include "os.h" @@ -57,7 +59,6 @@ #include "globals.h" #include "lispregs.h" #include "validate.h" -#include "monitor.h" #include "gc.h" #include "alloc.h" #include "dynbind.h" @@ -68,14 +69,16 @@ -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); @@ -91,17 +94,25 @@ void sigaddset_deferrable(sigset_t *s) 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) +void +sigaddset_blockable(sigset_t *s) { 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); #endif } @@ -109,32 +120,36 @@ void sigaddset_blockable(sigset_t *s) /* initialized in interrupt_init */ static sigset_t deferrable_sigset; static sigset_t blockable_sigset; +#endif void check_blockables_blocked_or_lose() { +#if !defined(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= 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, @@ -272,7 +304,6 @@ fake_foreign_function_call(os_context_t *context) /* 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) { @@ -289,7 +320,13 @@ undo_fake_foreign_function_call(os_context_t *context) #ifdef reg_ALLOC /* Put the dynamic space free pointer back into the context. */ *os_context_register_addr(context, reg_ALLOC) = - (unsigned long) dynamic_space_free_pointer; + (unsigned long) dynamic_space_free_pointer + | (*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 } @@ -307,14 +344,16 @@ interrupt_internal_error(int signal, siginfo_t *info, 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 @@ -337,11 +376,16 @@ interrupt_handle_pending(os_context_t *context) struct thread *thread; struct interrupt_data *data; - check_blockables_blocked_or_lose(); + FSHOW_SIGNAL((stderr, "/entering interrupt_handle_pending\n")); + check_blockables_blocked_or_lose(); thread=arch_os_get_current_thread(); data=thread->interrupt_data; + /* 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); + if (SymbolValue(GC_INHIBIT,thread)==NIL) { #ifdef LISP_FEATURE_SB_THREAD if (SymbolValue(STOP_FOR_GC_PENDING,thread) != NIL) { @@ -384,6 +428,7 @@ interrupt_handle_pending(os_context_t *context) * 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. @@ -392,6 +437,7 @@ interrupt_handle_pending(os_context_t *context) 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); @@ -422,16 +468,23 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) boolean were_in_lisp; #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 +#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) /* Under Linux on some architectures, we appear to have to restore the FPU control word from the context, as after the signal is delivered we appear to have a null FPU control word. */ os_restore_fp_control(context); #endif + + handler = interrupt_handlers[signal]; if (ARE_SAME_HANDLER(handler.c, SIG_IGN)) { @@ -455,7 +508,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) /* 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 @@ -470,8 +523,8 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) * 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); @@ -480,7 +533,11 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) #ifdef LISP_FEATURE_SB_THREAD { sigset_t unblock; + sigemptyset(&unblock); sigaddset(&unblock, SIG_STOP_FOR_GC); +#ifdef SIG_RESUME_FROM_GC + sigaddset(&unblock, SIG_RESUME_FROM_GC); +#endif thread_sigmask(SIG_UNBLOCK, &unblock, 0); } #endif @@ -495,8 +552,10 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) 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); } @@ -518,18 +577,19 @@ interrupt_handle_now(int signal, siginfo_t *info, void *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 before calling it. Trust the handler to finish * with the siginfo before enabling interrupts. */ void (*pending_handler) (int, siginfo_t*, void*)=data->pending_handler; + data->pending_handler=0; (*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) @@ -539,7 +599,7 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, 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. @@ -596,6 +656,9 @@ store_signal_data_for_later (struct interrupt_data *data, void *handler, data->pending_signal = signal; if(info) memcpy(&(data->pending_info), info, sizeof(siginfo_t)); + + FSHOW_SIGNAL((stderr, "/store_signal_data_for_later: signal: %d\n", signal)); + if(context) { /* the signal mask in the context (from before we were * interrupted) is copied to be restored when @@ -611,11 +674,17 @@ static void maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) { os_context_t *context = arch_os_get_context(&void_context); - struct thread *thread=arch_os_get_current_thread(); - struct interrupt_data *data=thread->interrupt_data; -#ifdef LISP_FEATURE_LINUX + + struct thread *thread; + struct interrupt_data *data; + + thread=arch_os_get_current_thread(); + data=thread->interrupt_data; + +#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) os_restore_fp_control(context); #endif + if(maybe_defer_handler(interrupt_handle_now,data,signal,info,context)) return; interrupt_handle_now(signal, info, context); @@ -630,9 +699,10 @@ low_level_interrupt_handle_now(int signal, siginfo_t *info, void *void_context) { os_context_t *context = (os_context_t*)void_context; -#ifdef LISP_FEATURE_LINUX +#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) os_restore_fp_control(context); #endif + check_blockables_blocked_or_lose(); check_interrupts_enabled_or_lose(context); interrupt_low_level_handlers[signal](signal, info, void_context); @@ -646,11 +716,16 @@ static void low_level_maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) { os_context_t *context = arch_os_get_context(&void_context); - struct thread *thread=arch_os_get_current_thread(); - struct interrupt_data *data=thread->interrupt_data; -#ifdef LISP_FEATURE_LINUX + struct thread *thread; + struct interrupt_data *data; + + thread=arch_os_get_current_thread(); + data=thread->interrupt_data; + +#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) os_restore_fp_control(context); #endif + if(maybe_defer_handler(low_level_interrupt_handle_now,data, signal,info,context)) return; @@ -660,6 +735,7 @@ low_level_maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) DARWIN_FIX_CONTEXT(context); #endif } +#endif #ifdef LISP_FEATURE_SB_THREAD @@ -667,6 +743,7 @@ void sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) { os_context_t *context = arch_os_get_context(&void_context); + struct thread *thread=arch_os_get_current_thread(); sigset_t ss; @@ -684,10 +761,6 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) 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)); @@ -695,8 +768,24 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) thread->state=STATE_SUSPENDED; FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread)); +#if defined(SIG_RESUME_FROM_GC) + sigemptyset(&ss); sigaddset(&ss,SIG_RESUME_FROM_GC); +#else sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC); - sigwaitinfo(&ss,0); +#endif + + /* 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 + 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", @@ -732,7 +821,7 @@ gc_trigger_hit(int signal, siginfo_t *info, os_context_t *context) else{ void *badaddr=arch_get_bad_addr(signal,info,context); return (badaddr >= (void *)current_auto_gc_trigger && - badaddr <((void *)current_dynamic_space + DYNAMIC_SPACE_SIZE)); + badaddr <((void *)current_dynamic_space + dynamic_space_size)); } } #endif @@ -743,12 +832,14 @@ gc_trigger_hit(int signal, siginfo_t *info, os_context_t *context) */ #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) +extern void call_into_lisp_tramp(void); +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); @@ -792,6 +883,35 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) u32 *sp=(u32 *)*os_context_register_addr(context,reg_ESP); +#if defined(LISP_FEATURE_DARWIN) + u32 *register_save_area = (u32 *)os_validate(0, 0x40); + + FSHOW_SIGNAL((stderr, "/arrange_return_to_lisp_function: preparing to go to function %x, sp: %x\n", function, sp)); + FSHOW_SIGNAL((stderr, "/arrange_return_to_lisp_function: context: %x, &context %x\n", context, &context)); + + /* 1. os_validate (malloc/mmap) register_save_block + * 2. copy register state into register_save_block + * 3. put a pointer to register_save_block in a register in the context + * 4. set the context's EIP to point to a trampoline which: + * a. builds the fake stack frame from the block + * b. frees the block + * c. calls the function + */ + + *register_save_area = *os_context_pc_addr(context); + *(register_save_area + 1) = function; + *(register_save_area + 2) = *os_context_register_addr(context,reg_EDI); + *(register_save_area + 3) = *os_context_register_addr(context,reg_ESI); + *(register_save_area + 4) = *os_context_register_addr(context,reg_EDX); + *(register_save_area + 5) = *os_context_register_addr(context,reg_ECX); + *(register_save_area + 6) = *os_context_register_addr(context,reg_EBX); + *(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; +#else + /* return address for call_into_lisp: */ *(sp-15) = (u32)post_signal_tramp; *(sp-14) = function; /* args for call_into_lisp : function*/ @@ -813,8 +933,11 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) *(sp-2)=*os_context_register_addr(context,reg_EBP); *(sp-1)=*os_context_pc_addr(context); +#endif + #elif defined(LISP_FEATURE_X86_64) u64 *sp=(u64 *)*os_context_register_addr(context,reg_RSP); + /* return address for call_into_lisp: */ *(sp-18) = (u64)post_signal_tramp; @@ -847,6 +970,8 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) #endif #ifdef LISP_FEATURE_X86 + +#if !defined(LISP_FEATURE_DARWIN) *os_context_pc_addr(context) = (os_context_register_t)call_into_lisp; *os_context_register_addr(context,reg_ECX) = 0; *os_context_register_addr(context,reg_EBP) = (os_context_register_t)(sp-2); @@ -855,7 +980,9 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) (os_context_register_t)(sp-15); #else *os_context_register_addr(context,reg_ESP) = (os_context_register_t)(sp-15); -#endif +#endif /* __NETBSD__ */ +#endif /* LISP_FEATURE_DARWIN */ + #elif defined(LISP_FEATURE_X86_64) *os_context_pc_addr(context) = (os_context_register_t)call_into_lisp; *os_context_register_addr(context,reg_RCX) = 0; @@ -885,9 +1012,11 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj 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)); @@ -901,11 +1030,13 @@ void interrupt_thread_handler(int num, siginfo_t *info, void *v_context) * 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(); @@ -987,7 +1118,9 @@ boolean 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); @@ -1013,15 +1146,21 @@ interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_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); +#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); } #endif +#endif funcall0(SymbolFunction(SUB_GC)); undo_fake_foreign_function_call(context); @@ -1033,6 +1172,94 @@ interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_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. + * + * It turns out that NetBSD's SA_NODEFER doesn't DTRT in a different + * way: if SA_NODEFER is set and the signal is in sa_mask, the signal + * will be unblocked in the sigmask during the signal handler. -- RMK + * X-mas day, 2005 + */ +static volatile int sigaction_nodefer_works = -1; + +#define SA_NODEFER_TEST_BLOCK_SIGNAL SIGABRT +#define SA_NODEFER_TEST_KILL_SIGNAL SIGUSR1 + +static void +sigaction_nodefer_test_handler(int signal, siginfo_t *info, void *void_context) +{ + sigset_t empty, current; + int i; + sigemptyset(&empty); + thread_sigmask(SIG_BLOCK, &empty, ¤t); + /* There should be exactly two blocked signals: the two we added + * to sa_mask when setting up the handler. NetBSD doesn't block + * the signal we're handling when SA_NODEFER is set; Linux before + * 2.6.13 or so also doesn't block the other signal when + * SA_NODEFER is set. */ + for(i = 1; i < NSIG; i++) + if (sigismember(¤t, i) != + (((i == SA_NODEFER_TEST_BLOCK_SIGNAL) || (i == signal)) ? 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, SA_NODEFER_TEST_BLOCK_SIGNAL); + sigaddset(&sa.sa_mask, SA_NODEFER_TEST_KILL_SIGNAL); + sigaction(SA_NODEFER_TEST_KILL_SIGNAL, &sa, &old_sa); + /* Make sure no signals are blocked. */ + { + sigset_t empty; + sigemptyset(&empty); + thread_sigmask(SIG_SETMASK, &empty, 0); + } + kill(getpid(), SA_NODEFER_TEST_KILL_SIGNAL); + while (sigaction_nodefer_works == -1); + sigaction(SA_NODEFER_TEST_KILL_SIGNAL, &old_sa, NULL); +} + +#undef SA_NODEFER_TEST_BLOCK_SIGNAL +#undef SA_NODEFER_TEST_KILL_SIGNAL + +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, @@ -1042,18 +1269,33 @@ undoably_install_low_level_interrupt_handler (int signal, 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; + /* The use of a trampoline appears to break the + arch_os_get_context() workaround for SPARC/Linux. For now, + don't use the trampoline (and so be vulnerable to the problems + that SA_NODEFER is meant to solve. */ +#if !(defined(LISP_FEATURE_SPARC) && defined(LISP_FEATURE_LINUX)) + else if (!sigaction_nodefer_works && + !sigismember(&blockable_sigset, signal)) + sa.sa_sigaction = low_level_unblock_me_trampoline; +#endif 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 @@ -1065,11 +1307,13 @@ undoably_install_low_level_interrupt_handler (int signal, 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; @@ -1084,16 +1328,19 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) (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); } @@ -1105,13 +1352,19 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) 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); @@ -1129,4 +1382,26 @@ interrupt_init() } SHOW("returning from interrupt_init()"); +#endif } + +#ifndef LISP_FEATURE_WIN32 +int +siginfo_code(siginfo_t *info) +{ + return info->si_code; +} +os_vm_address_t current_memory_fault_address; + +void +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. + * 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)); +} +#endif