X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Flinux-os.c;h=a30ab8049e4c009db2c0c9f5e7fb3a8ce24d2035;hb=cce46771e6d734c275f3e2d5620004da3b5d09ee;hp=113563ad28573ed1e7e1622fb2d76687583ec715;hpb=34dcb46f78a01d543756703d7ccdf3d999a134d0;p=sbcl.git diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index 113563a..a30ab80 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 @@ -40,54 +41,70 @@ #include #include #include +#include #include "validate.h" #include "thread.h" size_t os_vm_page_size; +#ifdef LISP_FEATURE_SB_FUTEX +#include +#include + +/* values taken from the kernel's linux/futex.h. This header file + doesn't exist in userspace, which is our excuse for not grovelling + them automatically */ +#define FUTEX_WAIT (0) +#define FUTEX_WAKE (1) +#define FUTEX_FD (2) +#define FUTEX_REQUEUE (3) + +#define __NR_sys_futex __NR_futex + +_syscall4(int,sys_futex, + int *, futex, + int, op, + int, val, + struct timespec *, rel); +#endif + #include "gc.h" +int linux_sparc_siginfo_bug = 0; +int linux_supports_futex=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. */ - { - struct utsname name; - int major_version; -#ifdef sparc - int minor_version; + /* Conduct various version checks: do we have enough mmap(), is + * this a sparc running 2.2, can we do threads? */ + int *futex=0; + struct utsname name; + int major_version; + int minor_version; + char *p; + uname(&name); + 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); + } + if (!(major_version>2 || minor_version >= 4)) { +#ifdef LISP_FEATURE_SB_THREAD + lose("linux kernel 2.4 required for thread-enabled SBCL"); #endif - uname(&name); - major_version = atoi(name.release); - if (major_version < 2) { - lose("linux 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_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 } - - os_vm_page_size = getpagesize(); - /* This could just as well be in arch_init(), but it's not. */ -#ifdef __i386__ - /* 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 - something?) Find out what this was meant to do, and reenable it - or delete it if possible. -- CSR, 2002-07-15 */ - /* SET_FPU_CONTROL_WORD(0x1372|4|8|16|32); no interrupts */ +#ifdef LISP_FEATURE_SB_FUTEX + futex_wait(futex,-1); + if(errno!=ENOSYS) linux_supports_futex=1; #endif + os_vm_page_size = getpagesize(); } @@ -126,7 +143,7 @@ os_validate(os_vm_address_t addr, os_vm_size_t len) under_2gb_free_pointer+=len; #endif - return addr; + return actual; } void @@ -205,9 +222,9 @@ void 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)) + if(!handle_guard_page_triggered(context,fault_addr)) interrupt_handle_now(signal, info, void_context); } @@ -237,7 +254,7 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context) 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); } } @@ -245,9 +262,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 +275,25 @@ os_install_interrupt_handlers(void) { undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT, sigsegv_handler); - undoably_install_low_level_interrupt_handler(SIGCONT, - sigcont_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); + 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 +int futex_wait(int *lock_word, int oldval) { + int t= sys_futex(lock_word,FUTEX_WAIT,oldval, 0); + return t; +} +int futex_wake(int *lock_word, int n){ + return sys_futex(lock_word,FUTEX_WAKE,n,0); +} +#endif