OpenJDK / jdk / jdk
changeset 47997:55c43e677ded
Merge
| author | tschatzl |
|---|---|
| date | Mon, 20 Nov 2017 12:04:13 +0100 |
| parents | 0fd0f31ade3e 8ad56b1b2b1f |
| children | fb0275c320a0 |
| files | |
| diffstat | 3 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/runtime/arguments.cpp Mon Nov 20 10:15:34 2017 +0100 +++ b/src/hotspot/share/runtime/arguments.cpp Mon Nov 20 12:04:13 2017 +0100 @@ -380,6 +380,9 @@ { "InitialRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, { "UseMembar", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, { "FastTLABRefill", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, + { "SafepointSpinBeforeYield", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, + { "DeferThrSuspendLoopCount", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, + { "DeferPollingPageLoopCount", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, { "UseCGroupMemoryLimitForHeap", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::jdk(11) }, { "IgnoreUnverifiableClassesDuringDump", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() },
--- a/src/hotspot/share/runtime/globals.hpp Mon Nov 20 10:15:34 2017 +0100 +++ b/src/hotspot/share/runtime/globals.hpp Mon Nov 20 12:04:13 2017 +0100 @@ -3274,16 +3274,18 @@ "Delay in scheduling GC workers (in milliseconds)") \ \ product(intx, DeferThrSuspendLoopCount, 4000, \ - "(Unstable) Number of times to iterate in safepoint loop " \ + "(Unstable, Deprecated) " \ + "Number of times to iterate in safepoint loop " \ "before blocking VM threads ") \ range(-1, max_jint-1) \ \ product(intx, DeferPollingPageLoopCount, -1, \ - "(Unsafe,Unstable) Number of iterations in safepoint loop " \ + "(Unsafe,Unstable,Deprecated) " \ + "Number of iterations in safepoint loop " \ "before changing safepoint polling page to RO ") \ range(-1, max_jint-1) \ \ - product(intx, SafepointSpinBeforeYield, 2000, "(Unstable)") \ + product(intx, SafepointSpinBeforeYield, 2000, "(Unstable, Deprecated)") \ range(0, max_intx) \ \ product(bool, PSChunkLargeArrays, true, \
--- a/src/hotspot/share/runtime/thread.cpp Mon Nov 20 10:15:34 2017 +0100 +++ b/src/hotspot/share/runtime/thread.cpp Mon Nov 20 12:04:13 2017 +0100 @@ -3559,12 +3559,12 @@ // Timing (must come after argument parsing) TraceTime timer("Create VM", TRACETIME_LOG(Info, startuptime)); - SafepointMechanism::initialize(); - // Initialize the os module after parsing the args jint os_init_2_result = os::init_2(); if (os_init_2_result != JNI_OK) return os_init_2_result; + SafepointMechanism::initialize(); + jint adjust_after_os_result = Arguments::adjust_after_os(); if (adjust_after_os_result != JNI_OK) return adjust_after_os_result;