#include "os.h"
#include "arch.h"
#include "globals.h"
-#include "sbcl.h"
#include "interrupt.h"
#include "interr.h"
#include "lispregs.h"
+#include "runtime.h"
+#include "genesis/static-symbols.h"
+#include "genesis/fdefn.h"
#include <sys/socket.h>
#include <sys/utsname.h>
#include "thread.h"
size_t os_vm_page_size;
-#ifdef LISP_FEATURE_SB_FUTEX
-#include <asm/unistd.h>
+#ifdef LISP_FEATURE_SB_THREAD
+#include <linux/unistd.h>
#include <errno.h>
/* values taken from the kernel's linux/futex.h. This header file
#include "gc.h"
\f
int linux_sparc_siginfo_bug = 0;
-int linux_supports_futex=0;
+int linux_no_threads_p = 0;
void os_init(void)
{
major_version);
}
if (!(major_version>2 || minor_version >= 4)) {
-#ifdef LISP_FEATURE_SB_THREAD
- lose("linux kernel 2.4 required for thread-enabled SBCL");
-#endif
#ifdef LISP_FEATURE_SPARC
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
}
-#ifdef LISP_FEATURE_SB_FUTEX
+#ifdef LISP_FEATURE_SB_THREAD
futex_wait(futex,-1);
- if(errno!=ENOSYS) linux_supports_futex=1;
+ if(errno==ENOSYS) linux_no_threads_p = 1;
+ if(linux_no_threads_p)
+ fprintf(stderr,"Linux with NPTL support (e.g. kernel 2.6 or newer) required for \nthread-enabled SBCL. Disabling thread support.\n\n");
#endif
os_vm_page_size = getpagesize();
}
sigsegv_handler(int signal, siginfo_t *info, void* void_context)
{
os_context_t *context = arch_os_get_context(&void_context);
- void* fault_addr = (void*)context->uc_mcontext.cr2;
+ void* fault_addr = (void*)info->si_addr;
if (!gencgc_handle_wp_violation(fault_addr))
- if(!handle_control_stack_guard_triggered(context,fault_addr))
- interrupt_handle_now(signal, info, void_context);
+ if(!handle_guard_page_triggered(context,fault_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
}
#else
interrupt_handle_pending(context);
} else {
if(!interrupt_maybe_gc(signal, info, context))
- if(!handle_control_stack_guard_triggered(context,addr))
+ if(!handle_guard_page_triggered(context,addr))
interrupt_handle_now(signal, info, context);
}
}
sig_stop_for_gc_handler);
undoably_install_low_level_interrupt_handler(SIG_THREAD_EXIT,
thread_exit_handler);
- if(!linux_supports_futex)
- undoably_install_low_level_interrupt_handler(SIG_DEQUEUE,
- sigcont_handler);
#endif
}
-#ifdef LISP_FEATURE_SB_FUTEX
+#ifdef LISP_FEATURE_SB_THREAD
int futex_wait(int *lock_word, int oldval) {
int t= sys_futex(lock_word,FUTEX_WAIT,oldval, 0);
return t;