--- a/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp Tue Jul 14 18:34:11 2015 +0000
@@ -34,7 +34,6 @@
define_pd_global(bool, ConvertSleepToYield, true);
define_pd_global(bool, ShareVtableStubs, true);
-define_pd_global(bool, CountInterpCalls, true);
define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this
define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks
@@ -61,8 +60,6 @@
define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5));
-define_pd_global(intx, PreInflateSpin, 10);
-
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
--- a/hotspot/src/cpu/ppc/vm/globals_ppc.hpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/cpu/ppc/vm/globals_ppc.hpp Tue Jul 14 18:34:11 2015 +0000
@@ -47,8 +47,6 @@
define_pd_global(intx, InlineFrequencyCount, 100);
define_pd_global(intx, InlineSmallCode, 1500);
-define_pd_global(intx, PreInflateSpin, 10);
-
// Flags for template interpreter.
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
--- a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp Tue Jul 14 18:34:11 2015 +0000
@@ -39,7 +39,6 @@
define_pd_global(bool, DontYieldALot, true); // yield no more than 100 times per second
define_pd_global(bool, ConvertSleepToYield, false); // do not convert sleep(0) to yield. Helps GUI
define_pd_global(bool, ShareVtableStubs, false); // improves performance markedly for mtrt and compress
-define_pd_global(bool, CountInterpCalls, false); // not implemented in the interpreter
define_pd_global(bool, NeedsDeoptSuspend, true); // register window machines need this
define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks
@@ -67,8 +66,6 @@
define_pd_global(intx, StackYellowPages, 2);
define_pd_global(intx, StackRedPages, 1);
-define_pd_global(intx, PreInflateSpin, 40); // Determined by running design center
-
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp Tue Jul 14 18:34:11 2015 +0000
@@ -33,7 +33,6 @@
define_pd_global(bool, ConvertSleepToYield, true);
define_pd_global(bool, ShareVtableStubs, true);
-define_pd_global(bool, CountInterpCalls, true);
define_pd_global(bool, NeedsDeoptSuspend, false); // only register window machines need this
define_pd_global(bool, ImplicitNullChecks, true); // Generate code for implicit null checks
@@ -66,8 +65,6 @@
define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5));
#endif // AMD64
-define_pd_global(intx, PreInflateSpin, 10);
-
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
--- a/hotspot/src/cpu/zero/vm/globals_zero.hpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp Tue Jul 14 18:34:11 2015 +0000
@@ -34,7 +34,6 @@
define_pd_global(bool, ConvertSleepToYield, true);
define_pd_global(bool, ShareVtableStubs, true);
-define_pd_global(bool, CountInterpCalls, true);
define_pd_global(bool, NeedsDeoptSuspend, false);
define_pd_global(bool, ImplicitNullChecks, true);
@@ -45,7 +44,6 @@
define_pd_global(intx, OptoLoopAlignment, 16);
define_pd_global(intx, InlineFrequencyCount, 100);
define_pd_global(intx, InlineSmallCode, 1000 );
-define_pd_global(intx, PreInflateSpin, 10);
define_pd_global(intx, StackYellowPages, 2);
define_pd_global(intx, StackRedPages, 1);
--- a/hotspot/src/os/windows/vm/os_windows.cpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Tue Jul 14 18:34:11 2015 +0000
@@ -3740,15 +3740,6 @@
"stack size not a multiple of page size");
initialize_performance_counter();
-
- // Win95/Win98 scheduler bug work-around. The Win95/98 scheduler is
- // known to deadlock the system, if the VM issues to thread operations with
- // a too high frequency, e.g., such as changing the priorities.
- // The 6000 seems to work well - no deadlocks has been notices on the test
- // programs that we have seen experience this problem.
- if (!os::win32::is_nt()) {
- StarvationMonitorInterval = 6000;
- }
}
--- a/hotspot/src/share/vm/runtime/arguments.cpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Tue Jul 14 18:34:11 2015 +0000
@@ -277,6 +277,8 @@
{ "ParallelGCRetainPLAB", JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "ThreadSafetyMargin", JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "LazyBootClassLoader", JDK_Version::jdk(9), JDK_Version::jdk(10) },
+ { "StarvationMonitorInterval", JDK_Version::jdk(9), JDK_Version::jdk(10) },
+ { "PreInflateSpin", JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ NULL, JDK_Version(0), JDK_Version(0) }
};
--- a/hotspot/src/share/vm/runtime/globals.hpp Tue Jul 14 09:33:20 2015 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp Tue Jul 14 18:34:11 2015 +0000
@@ -3282,9 +3282,6 @@
develop(intx, ProfilerNodeSize, 1024, \
"Size in K to allocate for the Profile Nodes of each thread") \
\
- product_pd(intx, PreInflateSpin, \
- "Number of times to spin wait before inflation") \
- \
/* gc parameters */ \
product(size_t, InitialHeapSize, 0, \
"Initial heap size (in bytes); zero means use ergonomics") \
@@ -3725,9 +3722,6 @@
develop(intx, LongCompileThreshold, 50, \
"Used with +TraceLongCompiles") \
\
- product(intx, StarvationMonitorInterval, 200, \
- "Pause between each check (in milliseconds)") \
- \
/* recompilation */ \
product_pd(intx, CompileThreshold, \
"number of interpreted method invocations before (re-)compiling") \
@@ -4080,9 +4074,6 @@
develop(bool, TraceDefaultMethods, false, \
"Trace the default method processing steps") \
\
- develop(bool, VerifyGenericSignatures, false, \
- "Abort VM on erroneous or inconsistent generic signatures") \
- \
diagnostic(bool, WhiteBoxAPI, false, \
"Enable internal testing APIs") \
\