#include "gc.h"
#if defined LISP_FEATURE_GENCGC
#include "gencgc-internal.h"
+#else
+#include "cheneygc-internal.h"
#endif
#ifdef LISP_FEATURE_X86
size_t os_vm_page_size;
-#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX)
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
#include <sys/syscall.h>
#include <unistd.h>
#include <errno.h>
}
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);
-
- /* 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;
+ struct timespec timeout;
+ int t;
- 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
{
/* Conduct various version checks: do we have enough mmap(), is
* this a sparc running 2.2, can we do threads? */
-#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX)
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
int *futex=0;
#endif
struct utsname name;
#endif
}
#ifdef LISP_FEATURE_SB_THREAD
-#if !defined(LISP_FEATURE_SB_LUTEX)
- futex_wait(futex,-1);
+#if !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
+ 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"
"LD_ASSUME_KERNEL\n");
}
#endif
- os_vm_page_size = getpagesize();
+
+ /* Don't use getpagesize(), since it's not constant across Linux
+ * 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_BYTES;
/* KLUDGE: Disable memory randomization on new Linux kernels
* by setting a personality flag and re-executing. (We need
/* 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);
#ifdef LISP_FEATURE_GENCGC
if (!gencgc_handle_wp_violation(addr))
#else
- if (!interrupt_maybe_gc(signal, info, context))
+ if (!cheneygc_handle_wp_violation(context, addr))
#endif
if (!handle_guard_page_triggered(context, addr))
-#ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK
- arrange_return_to_lisp_function(context, SymbolFunction(MEMORY_FAULT_ERROR));
-#else
- interrupt_handle_now(signal, info, context);
-#endif
+ lisp_memory_fault_error(context, addr);
}
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