#include <sys/types.h>
#include <sys/resource.h>
#include <sys/stat.h>
+#include <sys/sysctl.h>
#include <dlfcn.h>
+#ifdef LISP_FEATURE_X86
+#include <machine/cpu.h>
+#endif
static void openbsd_init();
#endif
void
os_init(char *argv[], char *envp[])
{
- os_vm_page_size = getpagesize();
+ os_vm_page_size = BACKEND_PAGE_BYTES;
#ifdef __NetBSD__
netbsd_init();
*/
void
-memory_fault_handler(int signal, siginfo_t *siginfo, os_context_t *context
-#if defined(LISP_FEATURE_FREEBSD) && defined(LISP_FEATURE_X86_64)
-/* FreeBSD/amd64 stores fault address only in undocumented 4th arg. */
- ,void *fault_addr
-#endif
- )
+memory_fault_handler(int signal, siginfo_t *siginfo, os_context_t *context)
{
-#if defined(LISP_FEATURE_FREEBSD) && defined(LISP_FEATURE_X86_64)
- /* KLUDGE: Store fault address into si_addr for compatibilities. */
- siginfo->si_addr = fault_addr;
-#else
void *fault_addr = arch_get_bad_addr(signal, siginfo, context);
-#endif
#if defined(LISP_FEATURE_RESTORE_TLS_SEGMENT_REGISTER_FROM_CONTEXT)
FSHOW_SIGNAL((stderr, "/ TLS: restoring fs: %p in memory_fault_handler\n",
#endif /* LISP_FEATURE_X86 */
}
-#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX)
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) \
+ && !defined(LISP_FEATURE_SB_LUTEX)
int
futex_wait(int *lock_word, long oldval, long sec, unsigned long usec)
{
#endif
char *
-os_get_runtime_executable_path()
+os_get_runtime_executable_path(int external)
{
char path[PATH_MAX + 1];
}
#elif defined(LISP_FEATURE_NETBSD) || defined(LISP_FEATURE_OPENBSD)
char *
-os_get_runtime_executable_path()
+os_get_runtime_executable_path(int external)
{
struct stat sb;
- char *path = strdup("/proc/curproc/file");
- if (path && ((stat(path, &sb)) == 0))
- return path;
- else {
- fprintf(stderr, "Couldn't stat /proc/curproc/file; is /proc mounted?\n");
- return NULL;
- }
+ if (!external && stat("/proc/curproc/file", &sb) == 0)
+ return copied_string("/proc/curproc/file");
+ return NULL;
}
#else /* Not DARWIN or FREEBSD or NETBSD or OPENBSD */
char *
-os_get_runtime_executable_path()
+os_get_runtime_executable_path(int external)
{
return NULL;
}
#endif
#ifdef __OpenBSD__
+
+int openbsd_use_fxsave = 0;
+
void
openbsd_init()
{
+#ifdef LISP_FEATURE_X86
+ int mib[2];
+ size_t size;
+#endif
+ /*
+ * Show a warning if it looks like the memory available after
+ * allocating the spaces won't be at least this much.
+ */
+#ifdef LISP_FEATURE_X86_64
+ const int wantfree = 64 * 1024 * 1024;
+#else
+ const int wantfree = 32 * 1024 * 1024;
+#endif
struct rlimit rl;
+#ifdef LISP_FEATURE_X86
+ /* Save the machdep.osfxsr sysctl for use by os_restore_fp_control() */
+ mib[0] = CTL_MACHDEP;
+ mib[1] = CPU_OSFXSR;
+ size = sizeof (openbsd_use_fxsave);
+ sysctl(mib, 2, &openbsd_use_fxsave, &size, NULL, 0);
+#endif
+
/* 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
+ * "staff" or "daemon" login classes run sbcl with larger dynamic
+ * space sizes.
*/
getrlimit (RLIMIT_DATA, &rl);
if (rl.rlim_cur < rl.rlim_max) {
}
}
- /* 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.
+ /*
+ * Display a (hopefully) helpful warning if it looks like we won't
+ * be able to allocate enough memory.
*/
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)
+ LINKAGE_TABLE_SPACE_SIZE + wantfree > 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");
+ " try decreasing the dynamic space size with --dynamic-space-size\n"
+ " or raising the datasize or datasize-max limits in /etc/login.conf\n");
}
/* OpenBSD's dlsym() relies on the gcc bulitin