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

comparison src/os/linux/vm/os_linux.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Mon, 27 Feb 2012 13:10:13 +0100
parents	04b9a2566eec de268c8a8075
children	897b7d18bebc

comparison

equal deleted inserted replaced

-:2cfb7fb2dce7
+:33df1aeaebbf
 /*
-* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2012, 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.
 #define MAX_PATH    (2 * K)
 // 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;
 }
 if (offset != NULL) *offset = addr - (address)dlinfo.dli_saddr;
 return true;
 } else if (dlinfo.dli_fname != NULL && dlinfo.dli_fbase != 0) {
 if (Decoder::decode((address)(addr - (address)dlinfo.dli_fbase),
-dlinfo.dli_fname, buf, buflen, offset) == Decoder::no_error) {
+buf, buflen, offset, dlinfo.dli_fname)) {
 return true;
 }
 }
 if (buf != NULL) buf[0] = '\0';
 // be supported or the memory may already be backed by huge pages.
 ::madvise(addr, bytes, MADV_HUGEPAGE);
 }
 }
-void os::free_memory(char *addr, size_t bytes) {
+void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
-commit_memory(addr, bytes, false);
+commit_memory(addr, bytes, alignment_hint, false);
 }
 void os::numa_make_global(char *addr, size_t bytes) {
 Linux::numa_interleave_memory(addr, bytes);
 }
 // Solaris uses poll(), linux uses park().
 // Poll() is likely a better choice, assuming that Thread.interrupt()
 // generates a SIGUSRx signal. Note that SIGUSR1 can interfere with
 // SIGSEGV, see 4355769.
-const int NANOSECS_PER_MILLISECS = 1000000;
 int os::sleep(Thread* thread, jlong millis, bool interruptible) {
 assert(thread == Thread::current(),  "thread consistency check");
 ParkEvent * const slp = thread->_SleepEvent ;
 slp->reset() ;
 if (newtime - prevtime < 0) {
 // time moving backwards, should only happen if no monotonic clock
 // not a guarantee() because JVM should not abort on kernel/glibc bugs
 assert(!Linux::supports_monotonic_clock(), "time moving backwards");
 } else {
-millis -= (newtime - prevtime) / NANOSECS_PER_MILLISECS;
+millis -= (newtime - prevtime) / NANOSECS_PER_MILLISEC;
 }
 if(millis <= 0) {
 return OS_OK;
 }
 if (newtime - prevtime < 0) {
 // time moving backwards, should only happen if no monotonic clock
 // not a guarantee() because JVM should not abort on kernel/glibc bugs
 assert(!Linux::supports_monotonic_clock(), "time moving backwards");
 } else {
-millis -= (newtime - prevtime) / NANOSECS_PER_MILLISECS;
+millis -= (newtime - prevtime) / NANOSECS_PER_MILLISEC;
 }
 if(millis <= 0) break ;
 prevtime = newtime;
 // not the entire user process, and user level threads are 1:1 mapped to kernel
 // threads. It has always been the case, but could change in the future. For
 // this reason, the code should not be used as default (ThreadPriorityPolicy=0).
 // It is only used when ThreadPriorityPolicy=1 and requires root privilege.
-int os::java_to_os_priority[MaxPriority + 1] = {
+int os::java_to_os_priority[CriticalPriority + 1] = {
 19,              // 0 Entry should never be used
 4,              // 1 MinPriority
 3,              // 2
 2,              // 3
 -2,              // 7
 -3,              // 8
 -4,              // 9 NearMaxPriority
--5               // 10 MaxPriority
+-5,              // 10 MaxPriority
+-5               // 11 CriticalPriority
 };
 static int prio_init() {
 if (ThreadPriorityPolicy == 1) {
 // Only root can raise thread priority. Don't allow ThreadPriorityPolicy=1
 if (!FLAG_IS_DEFAULT(ThreadPriorityPolicy)) {
 warning("-XX:ThreadPriorityPolicy requires root privilege on Linux");
 }
 ThreadPriorityPolicy = 0;
 }
+}
+if (UseCriticalJavaThreadPriority) {
+os::java_to_os_priority[MaxPriority] = os::java_to_os_priority[CriticalPriority];
 }
 return 0;
 }
 OSReturn os::set_native_priority(Thread* thread, int newpri) {
 jlong os::Linux::fast_thread_cpu_time(clockid_t clockid) {
 struct timespec tp;
 int rc = os::Linux::clock_gettime(clockid, &tp);
 assert(rc == 0, "clock_gettime is expected to return 0 code");
-return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
+return (tp.tv_sec * NANOSECS_PER_SEC) + tp.tv_nsec;
 }
 /////
 // glibc on Linux platform uses non-documented flag
 // to indicate, that some special sort of signal
 * on the condvar. Contention seen when trying to park implies that someone
 * is unparking you, so don't wait. And spurious returns are fine, so there
 * is no need to track notifications.
 */
-#define NANOSECS_PER_SEC 1000000000
-#define NANOSECS_PER_MILLISEC 1000000
 #define MAX_SECS 100000000
 /*
 * This code is common to linux and solaris and will be moved to a
 * common place in dolphin.
 *

Mercurial > hg > truffle

comparison src/os/linux/vm/os_linux.cpp @ 4970:33df1aeaebbf