X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbsd-os.c;h=a364d5a0b0ef5f69e5d441df7961b8b17e559da2;hb=c2ac5ba3964165ee2d21ccd4c6bf8bdc48e1a165;hp=8c973968f11253e1f6c7c0b618985db937800376;hpb=4023b1bec2412344e5eea4a33cd85dd662149c67;p=sbcl.git diff --git a/src/runtime/bsd-os.c b/src/runtime/bsd-os.c index 8c97396..a364d5a 100644 --- a/src/runtime/bsd-os.c +++ b/src/runtime/bsd-os.c @@ -59,10 +59,22 @@ static void netbsd_init(); #ifdef __FreeBSD__ #include +#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) +#include +#endif static void freebsd_init(); #endif /* __FreeBSD__ */ +#ifdef __OpenBSD__ +#include +#include +#include +#include + +static void openbsd_init(); +#endif + void os_init(char *argv[], char *envp[]) { @@ -72,6 +84,8 @@ os_init(char *argv[], char *envp[]) netbsd_init(); #elif defined(__FreeBSD__) freebsd_init(); +#elif defined(__OpenBSD__) + openbsd_init(); #endif } @@ -211,10 +225,6 @@ memory_fault_handler(int signal, siginfo_t *siginfo, void *void_context if (!maybe_gc(context)) { interrupt_handle_now(signal, siginfo, context); } -#if defined(LISP_FEATURE_DARWIN) - /* Work around G5 bug; fix courtesy gbyers */ - DARWIN_FIX_CONTEXT(context); -#endif #endif } } @@ -239,13 +249,6 @@ os_install_interrupt_handlers(void) (__siginfohandler_t *) #endif memory_fault_handler); -#ifdef SIG_MEMORY_FAULT2 - undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT2, -#ifdef LISP_FEATURE_FREEBSD - (__siginfohandler_t *) -#endif - memory_fault_handler); -#endif #endif #ifdef LISP_FEATURE_SB_THREAD @@ -276,8 +279,6 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context) if (!cheneygc_handle_wp_violation(context, addr)) if (!handle_guard_page_triggered(context, addr)) interrupt_handle_now(signal, info, context); - /* Work around G5 bug; fix courtesy gbyers */ - DARWIN_FIX_CONTEXT(context); } void @@ -286,10 +287,6 @@ os_install_interrupt_handlers(void) SHOW("os_install_interrupt_handlers()/bsd-os/!defined(GENCGC)"); undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT, sigsegv_handler); -#ifdef SIG_MEMORY_FAULT2 - undoably_install_low_level_interrupt_handler(SIG_MEMORY_FAULT2, - sigsegv_handler); -#endif } #endif /* defined GENCGC */ @@ -372,8 +369,19 @@ _socket(int domain, int type, int protocol) #endif /* __NetBSD__ */ #ifdef __FreeBSD__ +extern int getosreldate(void); + +int sig_memory_fault; + static void freebsd_init() { + /* Memory fault signal on FreeBSD was changed from SIGBUS to + * SIGSEGV. */ + if (getosreldate() < 700004) + sig_memory_fault = SIGBUS; + else + sig_memory_fault = SIGSEGV; + /* Quote from sbcl-devel (NIIMI Satoshi): "Some OSes, like FreeBSD * 4.x with GENERIC kernel, does not enable SSE support even on * SSE capable CPUs". Detect this situation and skip the @@ -381,17 +389,56 @@ static void freebsd_init() * x86-assem.S. */ #ifdef LISP_FEATURE_X86 - size_t len; - int instruction_sse; - - len = sizeof(instruction_sse); - if (sysctlbyname("hw.instruction_sse", &instruction_sse, &len, NULL, 0) == 0 - && instruction_sse != 0) { - /* Use the SSE detector */ - fast_bzero_pointer = fast_bzero_detect; + { + size_t len; + int instruction_sse; + + len = sizeof(instruction_sse); + if (sysctlbyname("hw.instruction_sse", &instruction_sse, &len, + NULL, 0) == 0 && instruction_sse != 0) { + /* Use the SSE detector */ + fast_bzero_pointer = fast_bzero_detect; + } } #endif /* LISP_FEATURE_X86 */ } + +#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) +int +futex_wait(int *lock_word, long oldval, long sec, unsigned long usec) +{ + struct timespec timeout; + int ret; + +again: + if (sec < 0) + ret = umtx_wait((void *)lock_word, oldval, NULL); + else { + timeout.tv_sec = sec; + timeout.tv_nsec = usec * 1000; + ret = umtx_wait((void *)lock_word, oldval, &timeout); + } + + switch (ret) { + case 0: + return 0; + case ETIMEDOUT: + return 1; + case EINTR: + /* spurious wakeup from interrupt */ + goto again; + default: + /* EWOULDBLOCK and others, need to check the lock */ + return -1; + } +} + +int +futex_wake(int *lock_word, int n) +{ + return umtx_wake((void *)lock_word, n); +} +#endif #endif /* __FreeBSD__ */ #ifdef LISP_FEATURE_DARWIN @@ -401,8 +448,6 @@ static void freebsd_init() #define KERN_PROC_PATHNAME 12 #endif -extern int getosreldate(void); - char * os_get_runtime_executable_path() { @@ -430,7 +475,7 @@ os_get_runtime_executable_path() return NULL; return copied_string(path); } -#elif defined(LISP_FEATURE_NETBSD) +#elif defined(LISP_FEATURE_NETBSD) || defined(LISP_FEATURE_OPENBSD) char * os_get_runtime_executable_path() { @@ -443,10 +488,64 @@ os_get_runtime_executable_path() return NULL; } } -#else /* Not DARWIN or FREEBSD or NETBSD */ +#else /* Not DARWIN or FREEBSD or NETBSD or OPENBSD */ char * os_get_runtime_executable_path() { return NULL; } #endif + +#ifdef __OpenBSD__ +void +openbsd_init() +{ + struct rlimit rl; + + /* OpenBSD, like NetBSD, counts mmap()ed space against the + * process's data size limit. If the soft limit is lower than the + * hard limit then try to yank it up, this lets users in the + * "staff" login class run sbcl with a default /etc/login.conf + */ + getrlimit (RLIMIT_DATA, &rl); + if (rl.rlim_cur < rl.rlim_max) { + rl.rlim_cur = rl.rlim_max; + if (setrlimit (RLIMIT_DATA, &rl) < 0) { + fprintf (stderr, + "RUNTIME WARNING: unable to raise process data size limit:\n\ + %s.\n\ +The system may fail to start.\n", + strerror(errno)); + } + } + + /* Display a (hopefully) helpful warning if it looks like we won't + * be able to allocate enough memory. In testing I found that on + * my system at least, a minimum of 25M on top of the three space + * sizes was needed to start SBCL. Show a warning below 32M so as + * to leave a little breathing room. + */ + getrlimit (RLIMIT_DATA, &rl); + if (dynamic_space_size + READ_ONLY_SPACE_SIZE + STATIC_SPACE_SIZE + + LINKAGE_TABLE_SPACE_SIZE + (32*1024*1024) > rl.rlim_cur) + fprintf (stderr, + "RUNTIME WARNING: data size resource limit may be too low,\n" + " try decreasing the dynamic space size with --dynamic-space-size\n"); +} + +/* OpenBSD's dlsym() relies on the gcc bulitin + * __builtin_return_address(0) returning an address in the + * executable's text segment, but when called from lisp it will return + * an address in the dynamic space. Work around this by calling this + * wrapper function instead. Note that tail-call optimization will + * defeat this, disable it by saving the dlsym() return value in a + * volatile variable. +*/ +void * +os_dlsym(void *handle, const char *symbol) +{ + void * volatile ret = dlsym(handle, symbol); + return ret; +} + +#endif