X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=65f50bf41ab6f4aec771c2eba4ff62d811a90124;hb=079ef9dad558ca07cb8178ef428bf738112174fa;hp=6907777bb1dee81c17155fdaa05331fcf1e72923;hpb=2b88fb32146f381eaa7b20d8b829af92841d63d4;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 6907777..65f50bf 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -13,14 +13,44 @@ * files for more information. */ + +/* As far as I can tell, what's going on here is: + * + * In the case of most signals, when Lisp asks us to handle the + * signal, the outermost handler (the one actually passed to UNIX) is + * either interrupt_handle_now(..) or maybe_now_maybe_later(..). + * In that case, the Lisp-level handler is stored in interrupt_handlers[..] + * and interrupt_low_level_handlers[..] is cleared. + * + * However, some signals need special handling, e.g. + * + * o the SIGSEGV (for e.g. Linux) or SIGBUS (for e.g. FreeBSD) used by the + * garbage collector to detect violations of write protection, + * because some cases of such signals (e.g. GC-related violations of + * write protection) are handled at C level and never passed on to + * Lisp. For such signals, we still store any Lisp-level handler + * in interrupt_handlers[..], but for the outermost handle we use + * the value from interrupt_low_level_handlers[..], instead of the + * ordinary interrupt_handle_now(..) or interrupt_handle_later(..). + * + * o the SIGTRAP (Linux/Alpha) which Lisp code uses to handle breakpoints, + * pseudo-atomic sections, and some classes of error (e.g. "function + * not defined"). This never goes anywhere near the Lisp handlers at all. + * See runtime/alpha-arch.c and code/signal.lisp + * + * - WHN 20000728, dan 20010128 */ + + #include #include #include #include +#include +#include +#include "sbcl.h" #include "runtime.h" #include "arch.h" -#include "sbcl.h" #include "os.h" #include "interrupt.h" #include "globals.h" @@ -34,6 +64,28 @@ #include "genesis/fdefn.h" #include "genesis/simple-fun.h" + + +void run_deferred_handler(struct interrupt_data *data, void *v_context) ; +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); + +extern volatile lispobj all_threads_lock; + +/* + * This is a workaround for some slightly silly Linux/GNU Libc + * behaviour: glibc defines sigset_t to support 1024 signals, which is + * more than the kernel. This is usually not a problem, but becomes + * one when we want to save a signal mask from a ucontext, and restore + * it later into another ucontext: the ucontext is allocated on the + * stack by the kernel, so copying a libc-sized sigset_t into it will + * overflow and cause other data on the stack to be corrupted */ + +#define REAL_SIGSET_SIZE_BYTES ((NSIG/8)) + void sigaddset_blockable(sigset_t *s) { sigaddset(s, SIGHUP); @@ -53,6 +105,10 @@ void sigaddset_blockable(sigset_t *s) sigaddset(s, SIGWINCH); sigaddset(s, SIGUSR1); sigaddset(s, SIGUSR2); +#ifdef LISP_FEATURE_SB_THREAD + sigaddset(s, SIG_STOP_FOR_GC); + sigaddset(s, SIG_INTERRUPT_THREAD); +#endif } /* When we catch an internal error, should we pass it back to Lisp to @@ -64,34 +120,39 @@ boolean internal_errors_enabled = 0; struct interrupt_data * global_interrupt_data; -/* As far as I can tell, what's going on here is: - * - * In the case of most signals, when Lisp asks us to handle the - * signal, the outermost handler (the one actually passed to UNIX) is - * either interrupt_handle_now(..) or interrupt_handle_later(..). - * In that case, the Lisp-level handler is stored in interrupt_handlers[..] - * and interrupt_low_level_handlers[..] is cleared. - * - * However, some signals need special handling, e.g. - * - * o the SIGSEGV (for e.g. Linux) or SIGBUS (for e.g. FreeBSD) used by the - * garbage collector to detect violations of write protection, - * because some cases of such signals (e.g. GC-related violations of - * write protection) are handled at C level and never passed on to - * Lisp. For such signals, we still store any Lisp-level handler - * in interrupt_handlers[..], but for the outermost handle we use - * the value from interrupt_low_level_handlers[..], instead of the - * ordinary interrupt_handle_now(..) or interrupt_handle_later(..). - * - * o the SIGTRAP (Linux/Alpha) which Lisp code uses to handle breakpoints, - * pseudo-atomic sections, and some classes of error (e.g. "function - * not defined"). This never goes anywhere near the Lisp handlers at all. - * See runtime/alpha-arch.c and code/signal.lisp - * - * - WHN 20000728, dan 20010128 */ +/* 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. */ + +#if 1 +void reset_signal_mask () +{ + sigset_t new; + sigemptyset(&new); + sigprocmask(SIG_SETMASK,&new,0); +} +#else +void reset_signal_mask () +{ + sigset_t new,old; + int i; + int wrong=0; + sigemptyset(&new); + sigprocmask(SIG_SETMASK,&new,&old); + for(i=1; iinterrupt_data; + /* FIXME I'm not altogether sure this is appropriate if we're + * here as the result of a pseudo-atomic */ SetSymbolValue(INTERRUPT_PENDING, NIL,thread); - if (maybe_gc_pending) { -#ifndef __i386__ - if (were_in_lisp) -#endif - { - fake_foreign_function_call(context); - } - funcall0(SymbolFunction(SUB_GC)); -#ifndef __i386__ - if (were_in_lisp) -#endif - { - undo_fake_foreign_function_call(context); - } - } + /* 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. + * This should ensure that when we return from the handler the + * blocked signals are unblocked */ + + memcpy(os_context_sigmask_addr(context), &data->pending_mask, + REAL_SIGSET_SIZE_BYTES); - /* FIXME: This isn't very clear. It would be good to reverse - * engineer it and rewrite the code more clearly, or write a clear - * explanation of what's going on in the comments, or both. - * - * WHN's question 1a: How come we unconditionally copy from - * pending_mask into the context, and then test whether - * pending_signal is set? - * - * WHN's question 1b: If pending_signal wasn't set, how could - * pending_mask be valid? - * - * Dan Barlow's reply (sbcl-devel 2001-03-13): And the answer is - - * or appears to be - because interrupt_maybe_gc set it that way - * (look in the #ifndef __i386__ bit). We can't GC during a - * pseudo-atomic, so we set maybe_gc_pending=1 and - * arch_set_pseudo_atomic_interrupted(..) When we come out of - * pseudo_atomic we're marked as interrupted, so we call - * interrupt_handle_pending, which does the GC using the pending - * context (it needs a context so that it has registers to use as - * GC roots) then notices there's no actual interrupt handler to - * call, so doesn't. That's the second question [1b] answered, - * anyway. Why we still need to copy the pending_mask into the - * context given that we're now done with the context anyway, I - * couldn't say. */ -#if 0 - memcpy(os_context_sigmask_addr(context), &pending_mask, - 4 /* sizeof(sigset_t) */ ); -#endif sigemptyset(&data->pending_mask); - if (data->pending_signal) { - int signal = data->pending_signal; - siginfo_t info; - memcpy(&info, &data->pending_info, sizeof(siginfo_t)); - data->pending_signal = 0; - interrupt_handle_now(signal, &info, context); - } + /* This will break on sparc linux: the deferred handler really wants + * to be called with a void_context */ + run_deferred_handler(data,(void *)context); } /* @@ -355,7 +364,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) { os_context_t *context = (os_context_t*)void_context; struct thread *thread=arch_os_get_current_thread(); -#ifndef __i386__ +#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) boolean were_in_lisp; #endif union interrupt_handler handler; @@ -372,7 +381,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) return; } -#ifndef __i386__ +#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) were_in_lisp = !foreign_function_call_active; if (were_in_lisp) #endif @@ -394,11 +403,18 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) lose("no handler for signal %d in interrupt_handle_now(..)", signal); } else if (lowtag_of(handler.lisp) == FUN_POINTER_LOWTAG) { + /* Once we've decided what to do about contexts in a + * return-elsewhere world (the original context will no longer + * be available; should we copy it or was nobody using it anyway?) + * then we should convert this to return-elsewhere */ + + /* CMUCL comment said "Allocate the SAPs while the interrupts + * are still disabled.". I (dan, 2003.08.21) assume this is + * because we're not in pseudoatomic and allocation shouldn't + * be interrupted. In which case it's no longer an issue as + * all our allocation from C now goes through a PA wrapper, + * but still, doesn't hurt */ - /* Allocate the SAPs while the interrupts are still disabled. - * (FIXME: Why? This is the way it was done in CMU CL, and it - * even had the comment noting that this is the way it was - * done, but no motivation..) */ lispobj info_sap,context_sap = alloc_sap(context); info_sap = alloc_sap(info); /* Allow signals again. */ @@ -424,11 +440,11 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) (*handler.c)(signal, info, void_context); } -#ifndef __i386__ +#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) if (were_in_lisp) #endif { - undo_fake_foreign_function_call(context); + undo_fake_foreign_function_call(context); /* block signals again */ } #ifdef QSHOW_SIGNALS @@ -438,16 +454,71 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) #endif } +/* This is called at the end of a critical section if the indications + * are that some signal was deferred during the section. Note that as + * 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 +run_deferred_handler(struct interrupt_data *data, void *v_context) { + (*(data->pending_handler)) + (data->pending_signal,&(data->pending_info), v_context); + data->pending_handler=0; +} + +boolean +maybe_defer_handler(void *handler, struct interrupt_data *data, + int signal, siginfo_t *info, os_context_t *context) +{ + struct thread *thread=arch_os_get_current_thread(); + if (SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) { + store_signal_data_for_later(data,handler,signal,info,context); + SetSymbolValue(INTERRUPT_PENDING, T,thread); + return 1; + } + /* 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 ( +#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) + (!foreign_function_call_active) && +#endif + arch_pseudo_atomic_atomic(context)) { + store_signal_data_for_later(data,handler,signal,info,context); + arch_set_pseudo_atomic_interrupted(context); + return 1; + } + return 0; +} static void -store_signal_data_for_later (struct interrupt_data *data, int signal, +store_signal_data_for_later (struct interrupt_data *data, void *handler, + int signal, siginfo_t *info, os_context_t *context) { + data->pending_handler = handler; data->pending_signal = signal; - memcpy(&(data->pending_info), info, sizeof(siginfo_t)); - memcpy(&(data->pending_mask), - os_context_sigmask_addr(context), - sizeof(sigset_t)); - sigaddset_blockable(os_context_sigmask_addr(context)); + if(info) + memcpy(&(data->pending_info), info, sizeof(siginfo_t)); + if(context) { + /* the signal mask in the context (from before we were + * interrupted) is copied to be restored when + * run_deferred_handler happens. Then the usually-blocked + * signals are added to the mask in the context so that we are + * running with blocked signals when the handler returns */ + sigemptyset(&(data->pending_mask)); + memcpy(&(data->pending_mask), + os_context_sigmask_addr(context), + REAL_SIGSET_SIZE_BYTES); + sigaddset_blockable(os_context_sigmask_addr(context)); + } else { + /* this is also called from gencgc alloc(), in which case + * there has been no signal and is therefore no context. */ + sigset_t new; + sigemptyset(&new); + sigaddset_blockable(&new); + sigprocmask(SIG_BLOCK,&new,&(data->pending_mask)); + } } @@ -460,30 +531,60 @@ maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) #ifdef LISP_FEATURE_LINUX os_restore_fp_control(context); #endif - /* see comments at top of code/signal.lisp for what's going on here - * with INTERRUPTS_ENABLED/INTERRUPT_HANDLE_NOW - */ - if (SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) { - store_signal_data_for_later(data,signal,info,context); - SetSymbolValue(INTERRUPT_PENDING, T,thread); - } else if ( -#ifndef __i386__ - (!foreign_function_call_active) && + if(maybe_defer_handler(interrupt_handle_now,data, + signal,info,context)) + return; + interrupt_handle_now(signal, info, context); +#ifdef LISP_FEATURE_DARWIN + /* Work around G5 bug */ + sigreturn(void_context); #endif - arch_pseudo_atomic_atomic(context)) { - store_signal_data_for_later(data,signal,info,context); - arch_set_pseudo_atomic_interrupted(context); - } else { - interrupt_handle_now(signal, info, context); +} + +#ifdef LISP_FEATURE_SB_THREAD +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(); + struct interrupt_data *data=thread->interrupt_data; + sigset_t ss; + int i; + + if(maybe_defer_handler(sig_stop_for_gc_handler,data, + signal,info,context)) { + return; } + /* need the context stored so it can have registers scavenged */ + fake_foreign_function_call(context); + + sigemptyset(&ss); + for(i=1;istate=STATE_STOPPED; + + sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC); + sigwaitinfo(&ss,0); + + undo_fake_foreign_function_call(context); } - +#endif void interrupt_handle_now_handler(int signal, siginfo_t *info, void *void_context) { os_context_t *context = arch_os_get_context(&void_context); interrupt_handle_now(signal, info, context); +#ifdef LISP_FEATURE_DARWIN + sigreturn(void_context); +#endif } /* @@ -512,21 +613,43 @@ gc_trigger_hit(int signal, siginfo_t *info, os_context_t *context) extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs); extern void post_signal_tramp(void); -void return_to_lisp_function(os_context_t *context, lispobj function) +void arrange_return_to_lisp_function(os_context_t *context, lispobj function) { +#ifndef LISP_FEATURE_X86 void * fun=native_pointer(function); - char *code = &(((struct simple_fun *) fun)->code); - + void *code = &(((struct simple_fun *) fun)->code); +#endif + /* Build a stack frame showing `interrupted' so that the * user's backtrace makes (as much) sense (as usual) */ #ifdef LISP_FEATURE_X86 /* Suppose the existence of some function that saved all * registers, called call_into_lisp, then restored GP registers and - * returned. We shortcut this: fake the stack that call_into_lisp - * would see, then arrange to have it called directly. post_signal_tramp - * is the second half of this function + * returned. It would look something like this: + + push ebp + mov ebp esp + pushad + push $0 + push $0 + pushl {address of function to call} + call 0x8058db0 + addl $12,%esp + popa + leave + ret + + * What we do here is set up the stack that call_into_lisp would + * expect to see if it had been called by this code, and frob the + * signal context so that signal return goes directly to call_into_lisp, + * and when that function (and the lisp function it invoked) returns, + * it returns to the second half of this imaginary function which + * restores all registers and returns to C + + * For this to work, the latter part of the imaginary function + * must obviously exist in reality. That would be post_signal_tramp */ - + u32 *sp=(u32 *)*os_context_register_addr(context,reg_ESP); *(sp-14) = post_signal_tramp; /* return address for call_into_lisp */ @@ -536,9 +659,9 @@ void return_to_lisp_function(os_context_t *context, lispobj function) /* this order matches that used in POPAD */ *(sp-10)=*os_context_register_addr(context,reg_EDI); *(sp-9)=*os_context_register_addr(context,reg_ESI); - /* this gets overwritten again before it's used, anyway */ - *(sp-8)=*os_context_register_addr(context,reg_EBP); - *(sp-7)=0 ; /* POPAD doesn't set ESP, but expects a gap for it anyway */ + + *(sp-8)=*os_context_register_addr(context,reg_ESP)-8; + *(sp-7)=0; *(sp-6)=*os_context_register_addr(context,reg_EBX); *(sp-5)=*os_context_register_addr(context,reg_EDX); @@ -547,19 +670,55 @@ void 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); +#elif defined(LISP_FEATURE_X86_64) + u64 *sp=(u64 *)*os_context_register_addr(context,reg_RSP); + *(sp-19) = post_signal_tramp; /* return address for call_into_lisp */ + + *(sp-18)=*os_context_register_addr(context,reg_R15); + *(sp-17)=*os_context_register_addr(context,reg_R14); + *(sp-16)=*os_context_register_addr(context,reg_R13); + *(sp-15)=*os_context_register_addr(context,reg_R12); + *(sp-14)=*os_context_register_addr(context,reg_R11); + *(sp-13)=*os_context_register_addr(context,reg_R10); + *(sp-12)=*os_context_register_addr(context,reg_R9); + *(sp-11)=*os_context_register_addr(context,reg_R8); + *(sp-10)=*os_context_register_addr(context,reg_RDI); + *(sp-9)=*os_context_register_addr(context,reg_RSI); + *(sp-8)=*os_context_register_addr(context,reg_RSP)-16; + *(sp-7)=0; + *(sp-6)=*os_context_register_addr(context,reg_RBX); + *(sp-5)=*os_context_register_addr(context,reg_RDX); + *(sp-4)=*os_context_register_addr(context,reg_RCX); + *(sp-3)=*os_context_register_addr(context,reg_RAX); + *(sp-2)=*os_context_register_addr(context,reg_RBP); + *(sp-1)=*os_context_pc_addr(context); + + *os_context_register_addr(context,reg_RDI) = function; /* function */ + *os_context_register_addr(context,reg_RSI) = 0; /* arg. array */ + *os_context_register_addr(context,reg_RDX) = 0; /* no. args */ #else struct thread *th=arch_os_get_current_thread(); build_fake_control_stack_frames(th,context); #endif - *os_context_pc_addr(context) = call_into_lisp; #ifdef LISP_FEATURE_X86 + *os_context_pc_addr(context) = call_into_lisp; *os_context_register_addr(context,reg_ECX) = 0; *os_context_register_addr(context,reg_EBP) = sp-2; +#ifdef __NetBSD__ + *os_context_register_addr(context,reg_UESP) = sp-14; +#else *os_context_register_addr(context,reg_ESP) = sp-14; +#endif +#elif defined(LISP_FEATURE_X86_64) + *os_context_pc_addr(context) = call_into_lisp; + *os_context_register_addr(context,reg_RCX) = 0; + *os_context_register_addr(context,reg_RBP) = sp-2; + *os_context_register_addr(context,reg_RSP) = sp-19; #else /* this much of the calling convention is common to all non-x86 ports */ + *os_context_pc_addr(context) = code; *os_context_register_addr(context,reg_NARGS) = 0; *os_context_register_addr(context,reg_LIP) = code; *os_context_register_addr(context,reg_CFP) = @@ -573,41 +732,77 @@ void return_to_lisp_function(os_context_t *context, lispobj function) *os_context_register_addr(context,reg_CODE) = fun + FUN_POINTER_LOWTAG; #endif -#ifdef LISP_FEATURE_LINUX - /* Under Linux on some architectures it seems we have to restore - the FPU control word from the context, as after the signal is - delivered we have a null FPU control word. */ - os_restore_fp_control(context); -#endif } -boolean handle_rt_signal(int num, siginfo_t *info, void *v_context) +#ifdef LISP_FEATURE_SB_THREAD +void interrupt_thread_handler(int num, siginfo_t *info, void *v_context) { - struct - os_context_t *context = (os_context_t*)arch_os_get_context(&v_context); - return_to_lisp_function(context,info->si_value.sival_int); + os_context_t *context = (os_context_t*)arch_os_get_context(&v_context); + struct thread *th=arch_os_get_current_thread(); + struct interrupt_data *data= + th ? th->interrupt_data : global_interrupt_data; + if(maybe_defer_handler(interrupt_thread_handler,data,num,info,context)){ + return ; + } + arrange_return_to_lisp_function(context,info->si_value.sival_int); } -boolean handle_control_stack_guard_triggered(os_context_t *context,void *addr) -{ +void thread_exit_handler(int num, siginfo_t *info, void *v_context) +{ /* called when a child thread exits */ + mark_dead_threads(); +} + +#endif + +/* KLUDGE: Theoretically the approach we use for undefined alien + * variables should work for functions as well, but on PPC/Darwin + * we get bus error at bogus addresses instead, hence this workaround, + * that has the added benefit of automatically discriminating between + * functions and variables. + */ +void undefined_alien_function() { + funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); +} + +boolean handle_guard_page_triggered(os_context_t *context,void *addr){ struct thread *th=arch_os_get_current_thread(); + /* note the os_context hackery here. When the signal handler returns, * it won't go back to what it was doing ... */ - if(addr>=(void *)CONTROL_STACK_GUARD_PAGE(th) && - addr<(void *)(CONTROL_STACK_GUARD_PAGE(th)+os_vm_page_size)) { - /* we hit the end of the control stack. disable protection - * temporarily so the error handler has some headroom */ - protect_control_stack_guard_page(th->pid,0L); - - return_to_lisp_function - (context, SymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR)); + if(addr >= CONTROL_STACK_GUARD_PAGE(th) && + addr < CONTROL_STACK_GUARD_PAGE(th) + os_vm_page_size) { + /* We hit the end of the control stack: disable guard page + * 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. */ + protect_control_stack_guard_page(th->pid,0); + protect_control_stack_return_guard_page(th->pid,1); + + arrange_return_to_lisp_function + (context, SymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR)); + return 1; + } + else if(addr >= CONTROL_STACK_RETURN_GUARD_PAGE(th) && + addr < CONTROL_STACK_RETURN_GUARD_PAGE(th) + os_vm_page_size) { + /* We're returning from the guard page: reprotect it, and + * unprotect this one. This works even if we somehow missed + * the return-guard-page, and hit it on our way to new + * exhaustion instead. */ + protect_control_stack_guard_page(th->pid,1); + protect_control_stack_return_guard_page(th->pid,0); + return 1; + } + 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)); return 1; } else return 0; } #ifndef LISP_FEATURE_GENCGC -/* This function gets called from the SIGSEGV (for e.g. Linux or +/* This function gets called from the SIGSEGV (for e.g. Linux, NetBSD, & * OpenBSD) or SIGBUS (for e.g. FreeBSD) handler. Here we check * whether the signal was due to treading on the mprotect()ed zone - * and if so, arrange for a GC to happen. */ @@ -623,67 +818,42 @@ interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) if(!foreign_function_call_active && gc_trigger_hit(signal, info, context)){ clear_auto_gc_trigger(); - - if (arch_pseudo_atomic_atomic(context)) { - /* don't GC during an atomic operation. Instead, copy the - * signal mask somewhere safe. interrupt_handle_pending - * will detect pending_signal==0 and know to do a GC with the - * signal context instead of calling a Lisp-level handler */ - maybe_gc_pending = 1; - if (data->pending_signal == 0) { - /* FIXME: This copy-pending_mask-then-sigaddset_blockable - * idiom occurs over and over. It should be factored out - * into a function with a descriptive name. */ - memcpy(&(data->pending_mask), - os_context_sigmask_addr(context), - sizeof(sigset_t)); - sigaddset_blockable(os_context_sigmask_addr(context)); - } - arch_set_pseudo_atomic_interrupted(context); - } - else { - fake_foreign_function_call(context); - /* SUB-GC may return without GCing if *GC-INHIBIT* is set, - * in which case we will be running with no gc trigger - * barrier thing for a while. But it shouldn't be long - * until the end of WITHOUT-GCING. */ - funcall0(SymbolFunction(SUB_GC)); - undo_fake_foreign_function_call(context); - } + if(!maybe_defer_handler + (interrupt_maybe_gc_int,data,signal,info,void_context)) + interrupt_maybe_gc_int(signal,info,void_context); return 1; - } else { - return 0; } + return 0; } + #endif + +/* this is also used by gencgc, in alloc() */ +boolean +interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) +{ + sigset_t new; + os_context_t *context=(os_context_t *) void_context; + fake_foreign_function_call(context); + /* SUB-GC may return without GCing if *GC-INHIBIT* is set, in + * which case we will be running with no gc trigger barrier + * thing for a while. But it shouldn't be long until the end + * of WITHOUT-GCING. */ + + sigemptyset(&new); + sigaddset_blockable(&new); + /* enable signals before calling into Lisp */ + sigprocmask(SIG_UNBLOCK,&new,0); + funcall0(SymbolFunction(SUB_GC)); + undo_fake_foreign_function_call(context); + return 1; +} + /* * noise to install handlers */ -/* SBCL used to have code to restore signal handlers on exit, which - * has been removed from the threaded version until we decide: exit of - * _what_ ? */ - -/* SBCL comment: The "undoably" aspect is because we also arrange with - * atexit() for the handler to be restored to its old value. This is - * for tidiness: it shouldn't matter much ordinarily, but it does - * remove a window where e.g. memory fault signals (SIGSEGV or SIGBUS, - * which in ordinary operation of SBCL are sent to the generational - * garbage collector, then possibly onward to Lisp code) or SIGINT - * (which is ordinarily passed to Lisp code) could otherwise be - * handled bizarrely/brokenly because the Lisp code would try to deal - * with them using machinery (like stream output buffers) which has - * already been dismantled. */ - -/* I'm not sure (a) whether this is a real concern, (b) how it helps - anyway */ - -void -uninstall_low_level_interrupt_handlers_atexit(void) -{ -} - void undoably_install_low_level_interrupt_handler (int signal, void handler(int, @@ -704,8 +874,11 @@ undoably_install_low_level_interrupt_handler (int signal, sigaddset_blockable(&sa.sa_mask); sa.sa_flags = SA_SIGINFO | SA_RESTART; #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK - if((signal==SIG_MEMORY_FAULT) || - (signal==SIG_INTERRUPT_THREAD)) + if((signal==SIG_MEMORY_FAULT) +#ifdef SIG_INTERRUPT_THREAD + || (signal==SIG_INTERRUPT_THREAD) +#endif + ) sa.sa_flags|= SA_ONSTACK; #endif @@ -734,8 +907,8 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) sigemptyset(&new); sigaddset_blockable(&new); - FSHOW((stderr, "/interrupt_low_level_handlers[signal]=%d\n", - interrupt_low_level_handlers[signal])); + FSHOW((stderr, "/data->interrupt_low_level_handlers[signal]=%d\n", + data->interrupt_low_level_handlers[signal])); if (data->interrupt_low_level_handlers[signal]==0) { if (ARE_SAME_HANDLER(handler, SIG_DFL) || ARE_SAME_HANDLER(handler, SIG_IGN)) {