X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Flinux-os.c;h=4a3f99491ca450c561a6235ecd30e03fe361d7dc;hb=2db410feb35e7e30c95af8f20f67e6177fa92488;hp=345ff482ba3941479cd798b4b909ba602f07eb48;hpb=844e8597d7ca9fda207ab2358ee027db86f6c120;p=sbcl.git diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c index 345ff48..4a3f994 100644 --- a/src/runtime/linux-os.c +++ b/src/runtime/linux-os.c @@ -34,8 +34,10 @@ #include "runtime.h" #include "genesis/static-symbols.h" #include "genesis/fdefn.h" + #include #include +#include #include #include @@ -50,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 @@ -60,7 +64,7 @@ int personality (unsigned long); size_t os_vm_page_size; -#ifdef LISP_FEATURE_SB_THREAD +#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) #include #include #include @@ -80,10 +84,30 @@ 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= sys_futex(lock_word,FUTEX_WAIT,oldval, 0); - return t; + struct timespec timeout; + int t; + + again: + 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) + /* spurious wakeup from interrupt */ + goto again; + else + /* EWOULDBLOCK and others, need to check the lock */ + return -1; } int @@ -95,6 +119,20 @@ futex_wake(int *lock_word, int n) int linux_sparc_siginfo_bug = 0; + +/* This variable was in real use for a few months, basically for + * storing autodetected information about whether the Linux + * installation was recent enough to support SBCL threads, and make + * some run-time decisions based on that. But this turned out to be + * unstable, so now we just flat-out refuse to start on the old installations + * when thread support has been compiled in. + * + * Unfortunately, in the meanwhile Slime started depending on this + * variable for deciding which communication style to use. So even + * though this variable looks unused, it shouldn't be deleted until + * it's no longer used in the versions of Slime that people are + * likely to download first. -- JES, 2006-06-07 + */ int linux_no_threads_p = 0; #ifdef LISP_FEATURE_SB_THREAD @@ -118,7 +156,7 @@ os_init(char *argv[], char *envp[]) { /* Conduct various version checks: do we have enough mmap(), is * this a sparc running 2.2, can we do threads? */ -#ifdef LISP_FEATURE_SB_THREAD +#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) int *futex=0; #endif struct utsname name; @@ -144,19 +182,26 @@ os_init(char *argv[], char *envp[]) #endif } #ifdef LISP_FEATURE_SB_THREAD - 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" "a version of SBCL without threading support.\n"); } +#endif if(! isnptl()) { lose("This version of SBCL only works correctly with the NPTL threading\n" "library. Please use a newer glibc, use an older SBCL, or stop using\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 @@ -171,7 +216,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); @@ -284,7 +331,14 @@ void os_protect(os_vm_address_t address, os_vm_size_t length, os_vm_prot_t prot) { if (mprotect(address, length, prot) == -1) { - perror("mprotect"); + if (errno == ENOMEM) { + lose("An mprotect call failed with ENOMEM. This probably means that the maximum amount\n" + "of separate memory mappings was exceeded. To fix the problem, either increase\n" + "the maximum with e.g. 'echo 262144 > /proc/sys/vm/max_map_count' or recompile\n" + "SBCL with a larger value for GENCGC-PAGE-SIZE in 'src/target/parms.lisp'."); + } else { + perror("mprotect"); + } } } @@ -348,11 +402,11 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context) #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)); + lisp_memory_fault_error(context, addr); #else interrupt_handle_now(signal, info, context); #endif