From d4d6c4b16a3655ce99a87d43f411391363531260 Mon Sep 17 00:00:00 2001 From: Gabor Melis Date: Mon, 17 Oct 2005 10:58:30 +0000 Subject: [PATCH] 0.9.5.76: * detect sigaction/sa_nodefer workingness at runtime instead of compile time * add sa_nodefer workaround to the high level interrupt handlers too * removed obsolote failing thread test * source consistency cosmetics --- src/runtime/interrupt.c | 137 +++++++++++++-------- src/runtime/interrupt.h | 4 +- src/runtime/thread.c | 1 + tests/threads.impure.lisp | 15 --- tools-for-build/grovel-features.sh | 2 - tools-for-build/sigaction-sa-nodefer-works-test.c | 53 -------- version.lisp-expr | 2 +- 7 files changed, 93 insertions(+), 121 deletions(-) delete mode 100644 tools-for-build/sigaction-sa-nodefer-works-test.c diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index d8c818a..a266301 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -68,14 +68,15 @@ -void run_deferred_handler(struct interrupt_data *data, void *v_context); +static 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); -void sigaddset_deferrable(sigset_t *s) +void +sigaddset_deferrable(sigset_t *s) { sigaddset(s, SIGHUP); sigaddset(s, SIGINT); @@ -98,7 +99,8 @@ void sigaddset_deferrable(sigset_t *s) #endif } -void sigaddset_blockable(sigset_t *s) +void +sigaddset_blockable(sigset_t *s) { sigaddset_deferrable(s); #ifdef LISP_FEATURE_SB_THREAD @@ -124,7 +126,8 @@ check_blockables_blocked_or_lose() } } -inline static void check_interrupts_enabled_or_lose(os_context_t *context) +inline static void +check_interrupts_enabled_or_lose(os_context_t *context) { struct thread *thread=arch_os_get_current_thread(); if (SymbolValue(INTERRUPTS_ENABLED,thread) == NIL) @@ -151,14 +154,16 @@ union interrupt_handler interrupt_handlers[NSIG]; * 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. */ -void reset_signal_mask(void) +void +reset_signal_mask(void) { sigset_t new; sigemptyset(&new); thread_sigmask(SIG_SETMASK,&new,0); } -void block_blockable_signals(void) +void +block_blockable_signals(void) { thread_sigmask(SIG_BLOCK, &blockable_sigset, 0); } @@ -221,6 +226,8 @@ build_fake_control_stack_frames(struct thread *th,os_context_t *context) #endif } +/* Stores the context for gc to scavange and builds fake stack + * frames. */ void fake_foreign_function_call(os_context_t *context) { @@ -270,7 +277,6 @@ fake_foreign_function_call(os_context_t *context) /* blocks all blockable signals. If you are calling from a signal handler, * the usual signal mask will be restored from the context when the handler * finishes. Otherwise, be careful */ - void undo_fake_foreign_function_call(os_context_t *context) { @@ -468,8 +474,8 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) * all our allocation from C now goes through a PA wrapper, * but still, doesn't hurt. * - * Yeah, but non-gencgc platforms that don't really wrap - * allocation in PA. MG - 2005-08-29 */ + * Yeah, but non-gencgc platforms don't really wrap allocation + * in PA. MG - 2005-08-29 */ lispobj info_sap,context_sap = alloc_sap(context); info_sap = alloc_sap(info); @@ -517,8 +523,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context) * 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 +static void 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 @@ -683,10 +688,6 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) sigfillset(&ss); /* Block everything. */ thread_sigmask(SIG_BLOCK,&ss,0); - /* The GC can't tell if a thread is a zombie, so this would be a - * good time to let the kernel reap any of our children in that - * awful state, to stop them from being waited for indefinitely. - * Userland reaping is done later when GC is finished */ if(thread->state!=STATE_RUNNING) { lose("sig_stop_for_gc_handler: wrong thread state: %ld\n", fixnum_value(thread->state)); @@ -744,12 +745,13 @@ gc_trigger_hit(int signal, siginfo_t *info, os_context_t *context) */ #if (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) -int *context_eflags_addr(os_context_t *context); +extern int *context_eflags_addr(os_context_t *context); #endif 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) +void +arrange_return_to_lisp_function(os_context_t *context, lispobj function) { #if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)) void * fun=native_pointer(function); @@ -886,7 +888,8 @@ void arrange_return_to_lisp_function(os_context_t *context, lispobj function) /* FIXME: this function can go away when all lisp handlers are invoked * via arrange_return_to_lisp_function. */ -void interrupt_thread_handler(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); /* let the handler enable interrupts again when it sees fit */ @@ -902,11 +905,13 @@ void interrupt_thread_handler(int num, siginfo_t *info, void *v_context) * that has the added benefit of automatically discriminating between * functions and variables. */ -void undefined_alien_function() { +void +undefined_alien_function() { funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); } -boolean handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) +boolean +handle_guard_page_triggered(os_context_t *context,os_vm_address_t addr) { struct thread *th=arch_os_get_current_thread(); @@ -1030,7 +1035,10 @@ interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) return 1; } -#ifndef LISP_FEATURE_SIGACTION_NODEFER_WORKS + +/* + * noise to install handlers + */ /* In Linux 2.4 synchronous signals (sigtrap & co) can be delivered if * they are blocked, in Linux 2.6 the default handler is invoked @@ -1040,22 +1048,57 @@ interrupt_maybe_gc_int(int signal, siginfo_t *info, void *void_context) * in question to the mask. That means if it's not blockable the * signal must be unblocked at the beginning of signal handlers. */ -void +static volatile int sigaction_nodefer_works = -1; + +static void +sigaction_nodefer_test_handler(int signal, siginfo_t *info, void *void_context) +{ + sigset_t empty, current; + int i; + sigemptyset(&empty); + sigprocmask(SIG_BLOCK, &empty, ¤t); + for(i = 1; i < NSIG; i++) + if (sigismember(¤t, i) != ((i == SIGABRT) ? 1 : 0)) { + FSHOW_SIGNAL((stderr, "SA_NODEFER doesn't work, signal %d\n", i)); + sigaction_nodefer_works = 0; + } + if (sigaction_nodefer_works == -1) + sigaction_nodefer_works = 1; +} + +static void +see_if_sigaction_nodefer_works() +{ + struct sigaction sa; + + sa.sa_flags = SA_SIGINFO | SA_NODEFER; + sa.sa_sigaction = sigaction_nodefer_test_handler; + sigemptyset(&sa.sa_mask); + sigaddset(&sa.sa_mask, SIGABRT); + sigaction(SIGTRAP, &sa, NULL); + kill(getpid(), SIGTRAP); + while (sigaction_nodefer_works == -1); +} + +static void unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) { sigset_t unblock; sigemptyset(&unblock); sigaddset(&unblock, signal); thread_sigmask(SIG_UNBLOCK, &unblock, 0); - (*interrupt_low_level_handlers[signal])(signal, info, void_context); + interrupt_handle_now_handler(signal, info, void_context); } -#endif - - -/* - * noise to install handlers - */ +static void +low_level_unblock_me_trampoline(int signal, siginfo_t *info, void *void_context) +{ + sigset_t unblock; + sigemptyset(&unblock); + sigaddset(&unblock, signal); + thread_sigmask(SIG_UNBLOCK, &unblock, 0); + (*interrupt_low_level_handlers[signal])(signal, info, void_context); +} void undoably_install_low_level_interrupt_handler (int signal, @@ -1069,21 +1112,19 @@ undoably_install_low_level_interrupt_handler (int signal, lose("bad signal number %d", signal); } - if (sigismember(&deferrable_sigset,signal)) + if (ARE_SAME_HANDLER(handler, SIG_DFL)) + sa.sa_sigaction = handler; + else if (sigismember(&deferrable_sigset,signal)) sa.sa_sigaction = low_level_maybe_now_maybe_later; -#ifndef LISP_FEATURE_SIGACTION_NODEFER_WORKS - else if (!sigismember(&blockable_sigset, signal)) - sa.sa_sigaction = unblock_me_trampoline; -#endif + else if (!sigaction_nodefer_works && + !sigismember(&blockable_sigset, signal)) + sa.sa_sigaction = low_level_unblock_me_trampoline; else sa.sa_sigaction = handler; sigcopyset(&sa.sa_mask, &blockable_sigset); - sa.sa_flags = SA_SIGINFO | SA_RESTART -#ifdef LISP_FEATURE_SIGACTION_NODEFER_WORKS - | SA_NODEFER -#endif - ; + sa.sa_flags = SA_SIGINFO | SA_RESTART | + (sigaction_nodefer_works ? SA_NODEFER : 0); #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK if((signal==SIG_MEMORY_FAULT) #ifdef SIG_INTERRUPT_THREAD @@ -1116,20 +1157,19 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) (unsigned int)interrupt_low_level_handlers[signal])); if (interrupt_low_level_handlers[signal]==0) { if (ARE_SAME_HANDLER(handler, SIG_DFL) || - ARE_SAME_HANDLER(handler, SIG_IGN)) { + ARE_SAME_HANDLER(handler, SIG_IGN)) sa.sa_sigaction = handler; - } else if (sigismember(&deferrable_sigset, signal)) { + else if (sigismember(&deferrable_sigset, signal)) sa.sa_sigaction = maybe_now_maybe_later; - } else { + else if (!sigaction_nodefer_works && + !sigismember(&blockable_sigset, signal)) + sa.sa_sigaction = unblock_me_trampoline; + else sa.sa_sigaction = interrupt_handle_now_handler; - } sigcopyset(&sa.sa_mask, &blockable_sigset); - sa.sa_flags = SA_SIGINFO | SA_RESTART -#ifdef LISP_FEATURE_SIGACTION_NODEFER_WORKS - | SA_NODEFER -#endif - ; + sa.sa_flags = SA_SIGINFO | SA_RESTART | + (sigaction_nodefer_works ? SA_NODEFER : 0); sigaction(signal, &sa, NULL); } @@ -1148,6 +1188,7 @@ interrupt_init() { int i; SHOW("entering interrupt_init()"); + see_if_sigaction_nodefer_works(); sigemptyset(&deferrable_sigset); sigemptyset(&blockable_sigset); sigaddset_deferrable(&deferrable_sigset); diff --git a/src/runtime/interrupt.h b/src/runtime/interrupt.h index b31d0f3..651668c 100644 --- a/src/runtime/interrupt.h +++ b/src/runtime/interrupt.h @@ -93,9 +93,9 @@ extern unsigned long install_handler(int signal, extern union interrupt_handler interrupt_handlers[NSIG]; /* Set all deferrable signals into *s. */ -void sigaddset_deferrable(sigset_t *s); +extern void sigaddset_deferrable(sigset_t *s); /* Set all blockable signals into *s. */ -void sigaddset_blockable(sigset_t *s); +extern void sigaddset_blockable(sigset_t *s); extern void block_blockable_signals(); diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 16a27b0..98a897c 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -211,6 +211,7 @@ create_thread_struct(lispobj initial_function) { if(SymbolValue(FREE_TLS_INDEX,0)==UNBOUND_MARKER_WIDETAG) { SetSymbolValue (FREE_TLS_INDEX, + /* FIXME: should be MAX_INTERRUPTS -1 ? */ make_fixnum(MAX_INTERRUPTS+ sizeof(struct thread)/sizeof(lispobj)), 0); diff --git a/tests/threads.impure.lisp b/tests/threads.impure.lisp index 8002d5b..bc56053 100644 --- a/tests/threads.impure.lisp +++ b/tests/threads.impure.lisp @@ -476,21 +476,6 @@ (lambda () (sb-ext:run-program "sleep" '("1") :search t :wait nil))) -(with-test (:name (:thread-start :dynamic-values-and-gc)) - (let ((gc-thread (sb-thread:make-thread (lambda () - (loop (sleep (random 0.2)) - (sb-ext:gc :full t)))))) - (wait-for-threads - (loop for i below 3000 - when (zerop (mod i 30)) - do (princ ".") - collect - (let ((*x* (lambda ()))) - (declare (special *x*)) - (sb-thread:make-thread (lambda () (functionp *x*)))))) - (sb-thread:terminate-thread gc-thread) - (terpri))) - #| ;; a cll post from eric marsden | (defun crash () | (setq *debugger-hook* diff --git a/tools-for-build/grovel-features.sh b/tools-for-build/grovel-features.sh index db7974f..81f171f 100644 --- a/tools-for-build/grovel-features.sh +++ b/tools-for-build/grovel-features.sh @@ -24,5 +24,3 @@ featurep os-provides-dlopen featurep os-provides-dladdr featurep os-provides-putwc - -featurep sigaction-sa-nodefer-works diff --git a/tools-for-build/sigaction-sa-nodefer-works-test.c b/tools-for-build/sigaction-sa-nodefer-works-test.c deleted file mode 100644 index 5208f48..0000000 --- a/tools-for-build/sigaction-sa-nodefer-works-test.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * See if SA_NODEFER makes sigaction ignore sa_mask - * altogether. According to POSIX SA_NODEFER means: 'don't add the - * handler's signal to the mask'. - */ - -/* - * This software is part of the SBCL system. See the README file for - * more information. - * - * While most of SBCL is derived from the CMU CL system, many - * utilities for the build process (like this one) were written from - * scratch after the fork from CMU CL. - * - * This software is in the public domain and is provided with - * absolutely no warranty. See the COPYING and CREDITS files for - * more information. - */ - -#include -#include -#include -#include -#include -#include -#include - -void -handler(int signal, siginfo_t *info, void *void_context) -{ - sigset_t empty, current; - int i; - sigemptyset(&empty); - sigprocmask(SIG_BLOCK, &empty, ¤t); - for(i = 1; i < NSIG; i++) - if (sigismember(¤t, i) != ((i == SIGABRT) ? 1 : 0)) - exit(128 + i); - exit(104); -} - -int -main (int argc, char *argv[]) -{ - struct sigaction sa; - - sa.sa_flags = SA_SIGINFO | SA_NODEFER; - sa.sa_sigaction = handler; - sigemptyset(&sa.sa_mask); - sigaddset(&sa.sa_mask, SIGABRT); - sigaction(SIGTRAP, &sa, NULL); - kill(getpid(), SIGTRAP); - while (1) sleep(1); -} diff --git a/version.lisp-expr b/version.lisp-expr index 594bffd..b19ac7d 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.5.75" +"0.9.5.76" -- 1.7.10.4