X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=e72bdd979bac9ada47306c087c1ce619dd340f7a;hb=8a632c14b592472873cfb214239c9387bc1a1ced;hp=7e278d19c8d3b45139eedeaf1c81d82e004c3df9;hpb=3be1ab042ab74e008e40626cc6bd5190b27da033;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 7e278d1..e72bdd9 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -136,27 +136,6 @@ check_blockables_blocked_or_lose(void) } void -check_gc_signals_unblocked_or_lose(void) -{ -#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 -#endif -} - -void unblock_gc_signals(void) { #ifdef LISP_FEATURE_SB_THREAD @@ -176,11 +155,7 @@ check_interrupts_enabled_or_lose(os_context_t *context) 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"); } @@ -301,7 +276,7 @@ fake_foreign_function_call(os_context_t *context) (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) +#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); } @@ -395,7 +370,7 @@ interrupt_internal_error(os_context_t *context, boolean continuable) * 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 */ @@ -406,14 +381,35 @@ interrupt_internal_error(os_context_t *context, boolean continuable) void interrupt_handle_pending(os_context_t *context) { + /* 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 + * 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. */ + + /* Win32 only needs to handle the GC cases (for now?) */ + struct thread *thread; - struct interrupt_data *data; + + /* Punt if in PA section, marking it as interrupted. This can + * happenat least if we pick up a GC request while in a + * WITHOUT-GCING with an outer PA -- it is not immediately clear + * to me that this should/could ever happen, but better safe then + * sorry. --NS 2007-05-15 */ + if (arch_pseudo_atomic_atomic(context)) { + arch_set_pseudo_atomic_interrupted(context); + return; + } + + thread = arch_os_get_current_thread(); 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. */ @@ -422,10 +418,8 @@ interrupt_handle_pending(os_context_t *context) 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 @@ -438,20 +432,17 @@ interrupt_handle_pending(os_context_t *context) check_blockables_blocked_or_lose(); } +#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) { @@ -459,9 +450,8 @@ interrupt_handle_pending(os_context_t *context) * 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); -#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. @@ -470,12 +460,12 @@ 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); } } +#endif } /* @@ -494,17 +484,15 @@ interrupt_handle_pending(os_context_t *context) */ void -interrupt_handle_now(int signal, siginfo_t *info, void *void_context) +interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) { - os_context_t *context = (os_context_t*)void_context; -#ifndef LISP_FEATURE_SB_THREAD +#ifdef FOREIGN_FUNCTION_CALL_FLAG 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); @@ -517,7 +505,6 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) os_restore_fp_control(context); #endif - handler = interrupt_handlers[signal]; if (ARE_SAME_HANDLER(handler.c, SIG_IGN)) { @@ -589,11 +576,10 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) /* Allow signals again. */ thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); #endif - - (*handler.c)(signal, info, void_context); + (*handler.c)(signal, info, context); } -#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64) +#ifdef FOREIGN_FUNCTION_CALL_FLAG if (were_in_lisp) #endif { @@ -611,7 +597,8 @@ interrupt_handle_now(int signal, siginfo_t *info, void *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 @@ -646,20 +633,10 @@ maybe_defer_handler(void *handler, struct interrupt_data *data, (unsigned long)thread->os_thread)); 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, @@ -707,66 +684,41 @@ 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; - struct interrupt_data *data; - - thread=arch_os_get_current_thread(); - data=thread->interrupt_data; + struct thread *thread = arch_os_get_current_thread(); + struct interrupt_data *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); -#ifdef LISP_FEATURE_DARWIN - /* Work around G5 bug */ - DARWIN_FIX_CONTEXT(context); -#endif + if(!maybe_defer_handler(interrupt_handle_now,data,signal,info,context)) + interrupt_handle_now(signal, info, context); } static void -low_level_interrupt_handle_now(int signal, siginfo_t *info, void *void_context) +low_level_interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) { - os_context_t *context = (os_context_t*)void_context; - -#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) - os_restore_fp_control(context); -#endif - + /* 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, void_context); -#ifdef LISP_FEATURE_DARWIN - /* Work around G5 bug */ - DARWIN_FIX_CONTEXT(context); -#endif + interrupt_low_level_handlers[signal](signal, info, context); + /* No Darwin context fixage needed, caller does that. */ } 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; - struct interrupt_data *data; - - thread=arch_os_get_current_thread(); - data=thread->interrupt_data; + struct thread *thread = arch_os_get_current_thread(); + struct interrupt_data *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; - low_level_interrupt_handle_now(signal, info, context); -#ifdef LISP_FEATURE_DARWIN - /* Work around G5 bug */ - DARWIN_FIX_CONTEXT(context); -#endif + if(!maybe_defer_handler(low_level_interrupt_handle_now,data, + signal,info,context)) + low_level_interrupt_handle_now(signal, info, context); } #endif @@ -780,53 +732,68 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) struct thread *thread=arch_os_get_current_thread(); sigset_t ss; - if ((arch_pseudo_atomic_atomic(context) || - SymbolValue(GC_INHIBIT,thread) != NIL)) { + if (arch_pseudo_atomic_atomic(context)) { 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", + arch_set_pseudo_atomic_interrupted(context); + FSHOW_SIGNAL((stderr,"thread=%lu sig_stop_for_gc deferred (PA)\n", thread->os_thread)); - } else { - /* need the context stored so it can have registers scavenged */ - fake_foreign_function_call(context); + return; + } + else if (SymbolValue(GC_INHIBIT,thread) != NIL) { + SetSymbolValue(STOP_FOR_GC_PENDING,T,thread); + FSHOW_SIGNAL((stderr, + "thread=%lu sig_stop_for_gc deferred (*GC-INHIBIT*)\n", + thread->os_thread)); + 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); + /* Block everything. */ + sigfillset(&ss); + thread_sigmask(SIG_BLOCK,&ss,0); + + /* Not pending anymore. */ + SetSymbolValue(GC_PENDING,NIL,thread); + SetSymbolValue(STOP_FOR_GC_PENDING,NIL,thread); + + 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)); + + sigemptyset(&ss); #if defined(SIG_RESUME_FROM_GC) - sigemptyset(&ss); sigaddset(&ss,SIG_RESUME_FROM_GC); + sigaddset(&ss,SIG_RESUME_FROM_GC); #else - sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC); + sigaddset(&ss,SIG_STOP_FOR_GC); #endif - /* It is possible to get SIGCONT (and probably other - * non-blockable signals) here. */ + /* 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); - } + { + int sigret; + do { sigwait(&ss, &sigret); } + while (sigret != SIG_RESUME_FROM_GC); + } #else - while (sigwaitinfo(&ss,0) != SIG_STOP_FOR_GC); + 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", - fixnum_value(thread->state)); - } - - undo_fake_foreign_function_call(context); + 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)); } + + undo_fake_foreign_function_call(context); } #endif @@ -834,19 +801,12 @@ 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 - DARWIN_FIX_CONTEXT(context); +#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) + os_restore_fp_control(context); #endif + interrupt_handle_now(signal, info, context); } -/* - * stuff to detect and handle hitting the GC trigger - */ - -#ifndef LISP_FEATURE_GENCGC -#endif - /* manipulate the signal context and stack such that when the handler * returns, it will call function instead of whatever it was doing * previously @@ -929,8 +889,10 @@ arrange_return_to_lisp_function(os_context_t *context, lispobj function) *(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: */ @@ -1040,7 +1002,7 @@ interrupt_thread_handler(int num, siginfo_t *info, void *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)); + arrange_return_to_lisp_function(context, StaticSymbolFunction(RUN_INTERRUPTION)); } #endif @@ -1052,8 +1014,9 @@ interrupt_thread_handler(int num, siginfo_t *info, void *v_context) * functions and variables. */ void -undefined_alien_function() { - funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); +undefined_alien_function(void) +{ + funcall0(StaticSymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); } boolean @@ -1073,7 +1036,7 @@ handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) 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) && @@ -1089,7 +1052,7 @@ handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) 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; @@ -1141,7 +1104,7 @@ sigaction_nodefer_test_handler(int signal, siginfo_t *info, void *void_context) } static void -see_if_sigaction_nodefer_works() +see_if_sigaction_nodefer_works(void) { struct sigaction sa, old_sa; @@ -1189,9 +1152,7 @@ low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) void undoably_install_low_level_interrupt_handler (int signal, - void handler(int, - siginfo_t*, - void*)) + interrupt_handler_t handler) { struct sigaction sa; @@ -1220,9 +1181,6 @@ undoably_install_low_level_interrupt_handler (int signal, | (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 @@ -1286,7 +1244,7 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) } void -interrupt_init() +interrupt_init(void) { #ifndef LISP_FEATURE_WIN32 int i; @@ -1324,20 +1282,33 @@ 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. + * 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)); + arrange_return_to_lisp_function(context, StaticSymbolFunction(MEMORY_FAULT_ERROR)); } #endif -/* Common logic far trapping instructions. How we actually handle each - * case is highly architecture dependant, but the overall shape is +static void +unhandled_trap_error(os_context_t *context) +{ + lispobj context_sap; + fake_foreign_function_call(context); + context_sap = alloc_sap(context); +#ifndef LISP_FEATURE_WIN32 + thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0); +#endif + funcall1(StaticSymbolFunction(UNHANDLED_TRAP_ERROR), context_sap); + lose("UNHANDLED-TRAP-ERROR fell through"); +} + +/* Common logic for trapping instructions. How we actually handle each + * case is highly architecture dependent, but the overall shape is * this. */ -boolean -maybe_handle_trap(os_context_t *context, int trap) +void +handle_trap(os_context_t *context, int trap) { switch(trap) { case trap_PendingInterrupt: @@ -1371,11 +1342,7 @@ maybe_handle_trap(os_context_t *context, int trap) fake_foreign_function_call(context); lose("%%PRIMITIVE HALT called; the party is over.\n"); default: - FSHOW((stderr,"/[C--trap default %d %d %x]\n", - signal, trap, context)); - /* Not our trap! */ - return 0; + unhandled_trap_error(context); } - return 1; }