X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=6bd4351305a1f19b8b47f3e0da3bbeed6d986e45;hb=83312cce6ee1c74fe99805831afb5cfbcb4248bd;hp=fdbbb9dd7167b2d3626fe26722439c9d7a5660b3;hpb=1b56edad1bf47547bbcd3b98c809b6f933ba937e;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index fdbbb9d..6bd4351 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -45,10 +45,12 @@ #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" @@ -62,6 +64,8 @@ #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, @@ -69,8 +73,7 @@ static void store_signal_data_for_later (struct interrupt_data *data, os_context_t *context); boolean interrupt_maybe_gc_int(int signal, siginfo_t *info, void *v_context); -extern lispobj all_threads_lock; -extern volatile int countdown_to_gc; +extern volatile lispobj all_threads_lock; /* * This is a workaround for some slightly silly Linux/GNU Libc @@ -103,8 +106,7 @@ void sigaddset_blockable(sigset_t *s) sigaddset(s, SIGUSR1); sigaddset(s, SIGUSR2); #ifdef LISP_FEATURE_SB_THREAD - /* don't block STOP_FOR_GC, we need to be able to interrupt threads - * for GC purposes even when they are blocked on queues etc */ + sigaddset(s, SIG_STOP_FOR_GC); sigaddset(s, SIG_INTERRUPT_THREAD); #endif } @@ -118,6 +120,39 @@ boolean internal_errors_enabled = 0; struct interrupt_data * global_interrupt_data; +/* 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); /* restore the saved signal mask from the original signal (the @@ -407,7 +444,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) if (were_in_lisp) #endif { - undo_fake_foreign_function_call(context); + undo_fake_foreign_function_call(context); /* block signals again */ } #ifdef QSHOW_SIGNALS @@ -427,6 +464,7 @@ 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 @@ -497,40 +535,56 @@ maybe_now_maybe_later(int signal, siginfo_t *info, void *void_context) signal,info,context)) return; interrupt_handle_now(signal, info, context); +#ifdef LISP_FEATURE_DARWIN + /* Work around G5 bug */ + sigreturn(void_context); +#endif } +#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 block; - + sigset_t ss; + int i; + if(maybe_defer_handler(sig_stop_for_gc_handler,data, - signal,info,context)){ + signal,info,context)) { return; } - sigemptyset(&block); - sigaddset_blockable(&block); - sigprocmask(SIG_BLOCK, &block, 0); - /* need the context stored so it can have registers scavenged */ fake_foreign_function_call(context); - get_spinlock(&all_threads_lock,thread->pid); - countdown_to_gc--; - release_spinlock(&all_threads_lock); - kill(getpid(),SIGSTOP); + 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 } /* @@ -561,18 +615,41 @@ 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) { +#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 */ @@ -582,9 +659,9 @@ void arrange_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); @@ -623,38 +700,59 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) } #ifdef LISP_FEATURE_SB_THREAD -void handle_rt_signal(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); struct thread *th=arch_os_get_current_thread(); struct interrupt_data *data= th ? th->interrupt_data : global_interrupt_data; - if(maybe_defer_handler(handle_rt_signal,data,num,info,context)){ + if(maybe_defer_handler(interrupt_thread_handler,data,num,info,context)){ return ; } arrange_return_to_lisp_function(context,info->si_value.sival_int); } + +void thread_exit_handler(int num, siginfo_t *info, void *v_context) +{ /* called when a child thread exits */ + mark_dead_threads(); +} + + #endif boolean handle_control_stack_guard_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); - - arrange_return_to_lisp_function - (context, SymbolFunction(CONTROL_STACK_EXHAUSTED_ERROR)); - return 1; + 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 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. */ @@ -680,16 +778,22 @@ interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) #endif -/* this is also used by from gencgc.c alloc() */ +/* 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; @@ -753,8 +857,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)) {