X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Flinux-os.c;h=6e391f27770d1c57fbdeaa2c3f70aa996eccc26b;hb=1a6c2275ab21acc79d3a6866d4749dda8f02f7d7;hp=2029247f35a28020a0500a696e2b3069869fd6ef;hpb=fe240ce504041bfb181a81cb11b7b4bba112f65f;p=sbcl.git diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index 2029247..6e391f2 100644 --- a/src/runtime/linux-os.c +++ b/src/runtime/linux-os.c @@ -23,14 +23,15 @@ #include #include #include +#include "sbcl.h" #include "./signal.h" #include "os.h" #include "arch.h" #include "globals.h" +#include "sbcl.h" #include "interrupt.h" #include "interr.h" #include "lispregs.h" -#include "sbcl.h" #include #include @@ -75,7 +76,7 @@ void os_init(void) #endif #ifdef LISP_FEATURE_SPARC if ((major_version <2) || (major_version==2 && minor_version < 4)) { - FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", minor_version)); + FSHOW((stderr,"linux kernel %d.%d predates 2.4;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", major_version,minor_version)); linux_sparc_siginfo_bug = 1; } #endif @@ -83,7 +84,7 @@ void os_init(void) os_vm_page_size = getpagesize(); /* This could just as well be in arch_init(), but it's not. */ -#ifdef __i386__ +#ifdef LISP_FEATURE_X86 /* FIXME: This used to be here. However, I have just removed it with no apparent ill effects (it may be that earlier kernels started up a process with a different set of traps, or @@ -248,9 +249,12 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context) void sigcont_handler(int signal, siginfo_t *info, void *void_context) { - /* we need to have a handler installed for this signal so that - * sigwaitinfo() for it actually returns at the appropriate time - */ + /* We need to have a handler installed for this signal so that + * sigwaitinfo() for it actually returns at the appropriate time. + * We don't need it to actually do anything. This mkes it + * possibly the only signal handler in SBCL that doesn't depend on + * not-guaranteed-by-POSIX features + */ } void @@ -258,7 +262,13 @@ os_install_interrupt_handlers(void) { undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT, sigsegv_handler); - undoably_install_low_level_interrupt_handler(SIGCONT, +#ifdef LISP_FEATURE_SB_THREAD + undoably_install_low_level_interrupt_handler(SIG_INTERRUPT_THREAD, + handle_rt_signal); + undoably_install_low_level_interrupt_handler(SIG_STOP_FOR_GC, + sig_stop_for_gc_handler); +#endif + undoably_install_low_level_interrupt_handler(SIG_DEQUEUE, sigcont_handler); }