truffle: src/os/linux/vm/os_linux.cpp comparison

comparison src/os/linux/vm/os_linux.cpp @ 2211:0cd39a385a72

Merge.

author	Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
date	Mon, 21 Feb 2011 19:17:33 +0100
parents	d25d4ca69222 63d374c54045
children	0654ee04b214

comparison

equal deleted inserted replaced

-:5d801e6b9a80
+:0cd39a385a72
 /*
-* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #endif
 #ifdef TARGET_ARCH_zero
 # include "assembler_zero.inline.hpp"
 # include "nativeInst_zero.hpp"
 #endif
+#ifdef TARGET_ARCH_arm
+# include "assembler_arm.inline.hpp"
+# include "nativeInst_arm.hpp"
+#endif
+#ifdef TARGET_ARCH_ppc
+# include "assembler_ppc.inline.hpp"
+# include "nativeInst_ppc.hpp"
+#endif
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
 #ifdef COMPILER2
 #include "opto/runtime.hpp"
 // for timer info max values which include all bits
 #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
 #define SEC_IN_NANOSECS  1000000000LL
+#define LARGEPAGES_BIT (1 << 6)
 ////////////////////////////////////////////////////////////////////////////////
 // global variables
 julong os::Linux::_physical_memory = 0;
 address   os::Linux::_initial_thread_stack_bottom = NULL;
 char *os::scan_pages(char *start, char* end, page_info* page_expected, page_info* page_found) {
 return end;
 }
-extern "C" void numa_warn(int number, char *where, ...) { }
+// Something to do with the numa-aware allocator needs these symbols
-extern "C" void numa_error(char *where) { }
+extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { }
+extern "C" JNIEXPORT void numa_error(char *where) { }
+extern "C" JNIEXPORT int fork1() { return fork(); }
 // If we are running with libnuma version > 2, then we should
 // be trying to use symbols with versions 1.1
 // If we are running with earlier version, which did not have symbol versions,
 return linux_mprotect(addr, size, PROT_NONE);
 }
 bool os::unguard_memory(char* addr, size_t size) {
 return linux_mprotect(addr, size, PROT_READ|PROT_WRITE);
+}
+/*
+* Set the coredump_filter bits to include largepages in core dump (bit 6)
+*
+* From the coredump_filter documentation:
+*
+* - (bit 0) anonymous private memory
+* - (bit 1) anonymous shared memory
+* - (bit 2) file-backed private memory
+* - (bit 3) file-backed shared memory
+* - (bit 4) ELF header pages in file-backed private memory areas (it is
+*           effective only if the bit 2 is cleared)
+* - (bit 5) hugetlb private memory
+* - (bit 6) hugetlb shared memory
+*/
+static void set_coredump_filter(void) {
+FILE *f;
+long cdm;
+if ((f = fopen("/proc/self/coredump_filter", "r+")) == NULL) {
+return;
+}
+if (fscanf(f, "%lx", &cdm) != 1) {
+fclose(f);
+return;
+}
+rewind(f);
+if ((cdm & LARGEPAGES_BIT) == 0) {
+cdm |= LARGEPAGES_BIT;
+fprintf(f, "%#lx", cdm);
+}
+fclose(f);
 }
 // Large page support
 static size_t _large_page_size = 0;
 if (_large_page_size > default_page_size) {
 _page_sizes[0] = _large_page_size;
 _page_sizes[1] = default_page_size;
 _page_sizes[2] = 0;
 }
+set_coredump_filter();
 // Large page support is available on 2.6 or newer kernel, some vendors
 // (e.g. Redhat) have backported it to their 2.4 based distributions.
 // We optimistically assume the support is available. If later it turns out
 // not true, VM will automatically switch to use regular page size.
 // the sa_flags field passed to sigaction() includes SA_SIGINFO and SA_RESTART.
 //
 // Note that the VM will print warnings if it detects conflicting signal
 // handlers, unless invoked with the option "-XX:+AllowUserSignalHandlers".
 //
-extern "C" int
+extern "C" JNIEXPORT int
 JVM_handle_linux_signal(int signo, siginfo_t* siginfo,
 void* ucontext, int abort_if_unrecognized);
 void signalHandler(int sig, siginfo_t* info, void* uc) {
 assert(info != NULL && uc != NULL, "it must be old kernel");
 jio_fprintf(stderr,
 "Could not open pause file '%s', continuing immediately.\n", filename);
 }
 }
-extern "C" {
-/**
-* NOTE: the following code is to keep the green threads code
-* in the libjava.so happy. Once the green threads is removed,
-* these code will no longer be needed.
-*/
-int
-jdk_waitpid(pid_t pid, int* status, int options) {
-return waitpid(pid, status, options);
-}
-int
-fork1() {
-return fork();
-}
-int
-jdk_sem_init(sem_t *sem, int pshared, unsigned int value) {
-return sem_init(sem, pshared, value);
-}
-int
-jdk_sem_post(sem_t *sem) {
-return sem_post(sem);
-}
-int
-jdk_sem_wait(sem_t *sem) {
-return sem_wait(sem);
-}
-int
-jdk_pthread_sigmask(int how , const sigset_t* newmask, sigset_t* oldmask) {
-return pthread_sigmask(how , newmask, oldmask);
-}
-}
 // Refer to the comments in os_solaris.cpp park-unpark.
 //
 // Beware -- Some versions of NPTL embody a flaw where pthread_cond_timedwait() can
 // hang indefinitely.  For instance NPTL 0.60 on 2.4.21-4ELsmp is vulnerable.

Mercurial > hg > truffle

comparison src/os/linux/vm/os_linux.cpp @ 2211:0cd39a385a72