1.0.25.52: go through lisp_memory_fault_error on all platforms

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

diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
index 236a33e..a860e16 100644 (file)
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -52,6 +52,8 @@
 #include "gc.h"
 #if defined LISP_FEATURE_GENCGC
 #include "gencgc-internal.h"
+#else
+#include "cheneygc-internal.h"
 #endif
 
 #ifdef LISP_FEATURE_X86
@@ -82,21 +84,28 @@ static inline int sys_futex (void *futex, int op, int val, struct timespec *rel)
 }
 
 int
-futex_wait(int *lock_word, int oldval)
+futex_wait(int *lock_word, int oldval, long sec, unsigned long usec)
 {
-    int t;
-  again:
-    t = sys_futex(lock_word,FUTEX_WAIT,oldval, 0);
+  struct timespec timeout;
+  int t;
 
-    /* Interrupted FUTEX_WAIT calls may return early.
-     *
-     * If someone manages to wake the futex while we're spinning
-     * around it, we will just return with -1 and errno EWOULDBLOCK,
-     * because the value has changed, so that's ok. */
-    if (t != 0 && errno == EINTR)
-        goto again;
-
-    return t;
+  if (sec<0) {
+    t = sys_futex(lock_word,FUTEX_WAIT,oldval, 0);
+  }
+  else {
+    timeout.tv_sec = sec;
+    timeout.tv_nsec = usec * 1000;
+    t = sys_futex(lock_word,FUTEX_WAIT,oldval, &timeout);
+  }
+  if (t==0)
+      return 0;
+  else if (errno==ETIMEDOUT)
+      return 1;
+  else if (errno==EINTR)
+      return 2;
+  else
+      /* EWOULDBLOCK and others, need to check the lock */
+      return -1;
 }
 
 int
@@ -172,7 +181,7 @@ os_init(char *argv[], char *envp[])
     }
 #ifdef LISP_FEATURE_SB_THREAD
 #if !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
-    futex_wait(futex,-1);
+    futex_wait(futex,-1,-1,0);
     if(errno==ENOSYS) {
        lose("This version of SBCL is compiled with threading support, but your kernel\n"
             "is too old to support this. Please use a more recent kernel or\n"
@@ -190,7 +199,7 @@ os_init(char *argv[], char *envp[])
      * kernel versions on some architectures (for example PPC). FIXME:
      * possibly the same should be done on other architectures too.
      */
-    os_vm_page_size = BACKEND_PAGE_SIZE;
+    os_vm_page_size = BACKEND_PAGE_BYTES;
 
     /* KLUDGE: Disable memory randomization on new Linux kernels
      * by setting a personality flag and re-executing. (We need
@@ -205,7 +214,9 @@ os_init(char *argv[], char *envp[])
          /* Some old kernels will apparently lose unsupported personality flags
           * on exec() */
          && ((minor_version == 6 && patch_version >= 11)
-             || (minor_version > 6)))
+             || (minor_version > 6)
+             /* This is what RHEL 3 reports */
+             || (minor_version == 4 && patch_version > 20)))
         || major_version >= 3)
     {
         int pers = personality(0xffffffffUL);
@@ -392,11 +403,7 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context)
     if (!cheneygc_handle_wp_violation(context, addr))
 #endif
         if (!handle_guard_page_triggered(context, addr))
-#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
             lisp_memory_fault_error(context, addr);
-#else
-            interrupt_handle_now(signal, info, context);
-#endif
 }
 
 void
@@ -405,8 +412,6 @@ os_install_interrupt_handlers(void)
     undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT,
                                                  sigsegv_handler);
 #ifdef LISP_FEATURE_SB_THREAD
-    undoably_install_low_level_interrupt_handler(SIG_INTERRUPT_THREAD,
-                                                 interrupt_thread_handler);
     undoably_install_low_level_interrupt_handler(SIG_STOP_FOR_GC,
                                                  sig_stop_for_gc_handler);
 #endif