X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=efe76e3aa9ffb5ca2bf45cfccc06bc73cfa688a0;hb=1419c1d2d50f039be46a8667351b7738ac4965e4;hp=c63083122f0460b913f0c784c7de8f0a5543d85a;hpb=040e4e707e4f7bc9bda2ab78774fd9205c44ee1f;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index c630831..efe76e3 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -571,6 +571,9 @@ boolean interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) { os_context_t *context=(os_context_t *) void_context; + struct thread *th=arch_os_get_current_thread(); + struct interrupt_data *data= + th ? th->interrupt_data : global_interrupt_data; if (!foreign_function_call_active #ifndef LISP_FEATURE_GENCGC @@ -589,11 +592,11 @@ interrupt_maybe_gc(int signal, siginfo_t *info, void *void_context) * 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 (pending_signal == 0) { + 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(&pending_mask, + memcpy(&(data->pending_mask), os_context_sigmask_addr(context), sizeof(sigset_t)); sigaddset_blockable(os_context_sigmask_addr(context));