X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=3e308b164d587affcd1c4e6ca09d07bddb9b859f;hb=94ac5b7c3ff37850210b6fc9a7593cf1c5752993;hp=bc6ed906948c14a0b65bd3fa225f3bbd2fd9861b;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index bc6ed90..3e308b1 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -14,13 +14,9 @@ */ #include - +#include +#include #include -#ifdef mach /* KLUDGE: #ifdef on lowercase symbols? Ick. -- WHN 19990904 */ -#ifdef mips -#include -#endif -#endif #include "runtime.h" #include "arch.h" @@ -36,6 +32,7 @@ #include "dynbind.h" #include "interr.h" + void sigaddset_blockable(sigset_t *s) { sigaddset(s, SIGHUP); @@ -44,6 +41,7 @@ void sigaddset_blockable(sigset_t *s) sigaddset(s, SIGPIPE); sigaddset(s, SIGALRM); sigaddset(s, SIGURG); + sigaddset(s, SIGFPE); sigaddset(s, SIGTSTP); sigaddset(s, SIGCHLD); sigaddset(s, SIGIO); @@ -75,7 +73,7 @@ os_context_t *lisp_interrupt_contexts[MAX_INTERRUPTS]; * * However, some signals need special handling, e.g. * - * o the SIGSEGV (for Linux) or SIGBUS (for FreeBSD) used by the + * 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 @@ -139,8 +137,8 @@ fake_foreign_function_call(os_context_t *context) == current_control_frame_pointer) { /* There is a small window during call where the callee's * frame isn't built yet. */ - if (LowtagOf(*os_context_register_addr(context, reg_CODE)) - == type_FunctionPointer) { + if (lowtag_of(*os_context_register_addr(context, reg_CODE)) + == FUN_POINTER_LOWTAG) { /* We have called, but not built the new frame, so * build it for them. */ current_control_frame_pointer[0] = @@ -213,6 +211,7 @@ undo_fake_foreign_function_call(os_context_t *context) * FREE_INTERRUPT_CONTEXT_INDEX? If so, we should say so. And * perhaps yes, unbind_to_here() really would be clearer and less * fragile.. */ + /* dan (2001.08.10) thinks the above supposition is probably correct */ unbind(); #ifdef reg_ALLOC @@ -242,7 +241,6 @@ interrupt_internal_error(int signal, siginfo_t *info, os_context_t *context, if (internal_errors_enabled) { SHOW("in interrupt_internal_error"); -#define QSHOW 1 #if QSHOW /* Display some rudimentary debugging information about the * error, so that even if the Lisp error handler gets badly @@ -320,7 +318,10 @@ interrupt_handle_pending(os_context_t *context) * 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. */ - memcpy(os_context_sigmask_addr(context), &pending_mask, sizeof(sigset_t)); +#if 0 + memcpy(os_context_sigmask_addr(context), &pending_mask, + 4 /* sizeof(sigset_t) */ ); +#endif sigemptyset(&pending_mask); if (pending_signal) { int signal = pending_signal; @@ -368,7 +369,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) if (ARE_SAME_HANDLER(handler.c, SIG_IGN)) { return; } - + #ifndef __i386__ were_in_lisp = !foreign_function_call_active; if (were_in_lisp) @@ -378,7 +379,9 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) } #ifdef QSHOW_SIGNALS - FSHOW((stderr, "in interrupt_handle_now(%d, info, context)\n", signal)); + FSHOW((stderr, + "/entering interrupt_handle_now(%d, info, context)\n", + signal)); #endif if (ARE_SAME_HANDLER(handler.c, SIG_DFL)) { @@ -388,7 +391,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) * support decides to pass on it. */ lose("no handler for signal %d in interrupt_handle_now(..)", signal); - } else if (LowtagOf(handler.lisp) == type_FunctionPointer) { + } else if (lowtag_of(handler.lisp) == FUN_POINTER_LOWTAG) { /* Allocate the SAPs while the interrupts are still disabled. * (FIXME: Why? This is the way it was done in CMU CL, and it @@ -425,6 +428,12 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) { undo_fake_foreign_function_call(context); } + +#ifdef QSHOW_SIGNALS + FSHOW((stderr, + "/returning from interrupt_handle_now(%d, info, context)\n", + signal)); +#endif } static void @@ -506,10 +515,10 @@ gc_trigger_hit(int signal, siginfo_t *info, os_context_t *context) #endif #ifndef __i386__ -/* This function gets called from the SIGSEGV (Linux) or SIGBUS (BSD) - * 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. - */ +/* This function gets called from the SIGSEGV (for e.g. Linux or + * 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. */ boolean interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) { @@ -542,11 +551,20 @@ interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) arch_set_pseudo_atomic_interrupted(context); } else { + lispobj *old_free_space=current_dynamic_space; fake_foreign_function_call(context); funcall0(SymbolFunction(MAYBE_GC)); undo_fake_foreign_function_call(context); - } - + if(current_dynamic_space==old_free_space) + /* MAYBE-GC (as the name suggest) might not. If it + * doesn't, it won't reset the GC trigger either, so we + * have to do it ourselves. Add small amount of space + * to tide us over while GC is inhibited + */ + set_auto_gc_trigger((u32)dynamic_space_free_pointer + -(u32)current_dynamic_space + +(u32)os_vm_page_size); + } return 1; } else { return 0; @@ -558,22 +576,78 @@ interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) * noise to install handlers */ -/* Install a special low-level handler for signal; or if handler is - * SIG_DFL, remove any special handling for signal. */ +/* + * what low-level signal handlers looked like before + * undoably_install_low_level_interrupt_handler() got involved + */ +struct low_level_signal_handler_state { + int was_modified; + void (*handler)(int, siginfo_t*, void*); +} old_low_level_signal_handler_states[NSIG]; + void -interrupt_install_low_level_handler (int signal, - void handler(int, siginfo_t*, void*)) +uninstall_low_level_interrupt_handlers_atexit(void) +{ + int signal; + for (signal = 0; signal < NSIG; ++signal) { + struct low_level_signal_handler_state + *old_low_level_signal_handler_state = + old_low_level_signal_handler_states + signal; + if (old_low_level_signal_handler_state->was_modified) { + struct sigaction sa; + sa.sa_sigaction = old_low_level_signal_handler_state->handler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_SIGINFO | SA_RESTART; + sigaction(signal, &sa, NULL); + } + } +} + +/* Undoably install a special low-level handler for signal; or if + * handler is SIG_DFL, remove any special handling for signal. + * + * 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. */ +void +undoably_install_low_level_interrupt_handler (int signal, + void handler(int, + siginfo_t*, + void*)) { struct sigaction sa; + struct low_level_signal_handler_state *old_low_level_signal_handler_state = + old_low_level_signal_handler_states + signal; + + if (0 > signal || signal >= NSIG) { + lose("bad signal number %d", signal); + } sa.sa_sigaction = handler; sigemptyset(&sa.sa_mask); sigaddset_blockable(&sa.sa_mask); sa.sa_flags = SA_SIGINFO | SA_RESTART; - sigaction(signal, &sa, NULL); + /* In the case of interrupt handlers which are modified more than + * once, we only save the original unmodified copy. */ + if (!old_low_level_signal_handler_state->was_modified) { + struct sigaction *old_handler = + (struct sigaction*) &old_low_level_signal_handler_state->handler; + old_low_level_signal_handler_state->was_modified = 1; + sigaction(signal, &sa, old_handler); + } else { + sigaction(signal, &sa, NULL); + } + interrupt_low_level_handlers[signal] = - (ARE_SAME_HANDLER(handler,SIG_DFL) ? 0 : handler); + (ARE_SAME_HANDLER(handler, SIG_DFL) ? 0 : handler); } /* This is called from Lisp. */ @@ -584,7 +658,7 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) sigset_t old, new; union interrupt_handler oldhandler; - FSHOW((stderr, "entering POSIX install_handler(%d, ..)\n", signal)); + FSHOW((stderr, "/entering POSIX install_handler(%d, ..)\n", signal)); sigemptyset(&new); sigaddset(&new, signal); @@ -593,7 +667,7 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) sigemptyset(&new); sigaddset_blockable(&new); - FSHOW((stderr, "interrupt_low_level_handlers[signal]=%d\n", + FSHOW((stderr, "/interrupt_low_level_handlers[signal]=%d\n", interrupt_low_level_handlers[signal])); if (interrupt_low_level_handlers[signal]==0) { if (ARE_SAME_HANDLER(handler, SIG_DFL) || @@ -617,7 +691,7 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) sigprocmask(SIG_SETMASK, &old, 0); - FSHOW((stderr, "leaving POSIX install_handler(%d, ..)\n", signal)); + FSHOW((stderr, "/leaving POSIX install_handler(%d, ..)\n", signal)); return (unsigned long)oldhandler.lisp; } @@ -627,6 +701,12 @@ interrupt_init(void) { int i; + SHOW("entering interrupt_init()"); + + /* Set up for recovery from any installed low-level handlers. */ + atexit(&uninstall_low_level_interrupt_handlers_atexit); + + /* Set up high level handler information. */ for (i = 0; i < NSIG; i++) { interrupt_handlers[i].c = /* (The cast here blasts away the distinction between @@ -636,4 +716,6 @@ interrupt_init(void) * 3-argument form is expected.) */ (void (*)(int, siginfo_t*, void*))SIG_DFL; } + + SHOW("returning from interrupt_init()"); }