0.8.4.10

[sbcl.git] / src / runtime / linux-os.c

diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
index 113563a..6e391f2 100644 (file)
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -23,14 +23,15 @@
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
+#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 <sys/socket.h>
 #include <sys/utsname.h>
 
@@ -40,6 +41,7 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <linux/version.h>
 
 #include "validate.h"
 #include "thread.h"
@@ -47,40 +49,42 @@ size_t os_vm_page_size;
 
 #include "gc.h"
 \f
+int linux_sparc_siginfo_bug = 0;
 
-#ifdef sparc
-int early_kernel = 0;
-#endif
 void os_init(void)
 {
-    /* Early versions of Linux don't support the mmap(..) functionality
-     * that we need. */
+    /* Conduct various version checks: do we have enough mmap(), is
+     * this a sparc running 2.2, can we do threads? */
     {
         struct utsname name;
        int major_version;
-#ifdef sparc
        int minor_version;
-#endif
+       char *p;
        uname(&name);
-       major_version = atoi(name.release);
-       if (major_version < 2) {
-           lose("linux major version=%d (can't run in version < 2.0.0)",
+       p=name.release;  
+       major_version = atoi(p);
+       p=strchr(p,'.')+1;
+       minor_version = atoi(p);
+       if (major_version<2) {
+           lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)",
                 major_version);
        }
-#ifdef sparc
-       /* KLUDGE: This will break if Linux moves to a uname() version number
-        * that has more than one digit initially -- CSR, 2002-02-12 */
-       minor_version = atoi(name.release+2);
-       if (minor_version < 4) {
-           FSHOW((stderr,"linux minor version=%d;\n enabling workarounds for SPARC kernel bugs in signal handling.\n", minor_version));
-           early_kernel = 1;
+#ifdef LISP_FEATURE_SB_THREAD
+       if ((major_version <2) || (major_version==2 && minor_version < 4)) {
+           lose("linux kernel 2.4 required for thread-enabled SBCL");
+       }
+#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", major_version,minor_version));
+           linux_sparc_siginfo_bug = 1;
        }
 #endif
     }
 
     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
@@ -126,7 +130,7 @@ os_validate(os_vm_address_t addr, os_vm_size_t len)
     under_2gb_free_pointer+=len;
 #endif
 
-    return addr;
+    return actual;
 }
 
 void
@@ -245,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
@@ -255,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);
 }