136 lines
5.1 KiB
Diff
136 lines
5.1 KiB
Diff
# HG changeset patch
|
|
# User dholmes
|
|
# Date 1493428477 14400
|
|
# Fri Apr 28 21:14:37 2017 -0400
|
|
# Node ID 2fee74c5547889d9698a2636e0a5170f9e66fb9c
|
|
# Parent 13a04e8df5a3af73794146b930b32556c7cbc5b0
|
|
8179084, PR3409, RH1455694: HotSpot VM fails to start when AggressiveHeap is set
|
|
Reviewed-by: kbarrett, stefank
|
|
|
|
diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
|
|
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp
|
|
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
|
|
@@ -3193,8 +3193,6 @@
|
|
|
|
// Enable parallel GC and adaptive generation sizing
|
|
FLAG_SET_CMDLINE(bool, UseParallelGC, true);
|
|
- FLAG_SET_DEFAULT(ParallelGCThreads,
|
|
- Abstract_VM_Version::parallel_worker_threads());
|
|
|
|
// Encourage steady state memory management
|
|
FLAG_SET_CMDLINE(uintx, ThresholdTolerance, 100);
|
|
diff --git a/test/TEST.groups b/test/TEST.groups
|
|
--- openjdk/hotspot/test/TEST.groups
|
|
+++ openjdk/hotspot/test/TEST.groups
|
|
@@ -1,5 +1,5 @@
|
|
#
|
|
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
|
|
+# Copyright (c) 2013, 2017, 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
|
|
@@ -164,6 +164,7 @@
|
|
gc/TestGCLogRotationViaJcmd.java \
|
|
gc/g1/TestHumongousAllocInitialMark.java \
|
|
gc/g1/TestHumongousShrinkHeap.java \
|
|
+ gc/arguments/TestAggressiveHeap.java \
|
|
gc/arguments/TestG1HeapRegionSize.java \
|
|
gc/metaspace/TestMetaspaceMemoryPool.java \
|
|
gc/arguments/TestDynMinHeapFreeRatio.java \
|
|
diff --git a/test/gc/arguments/TestAggressiveHeap.java b/test/gc/arguments/TestAggressiveHeap.java
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ openjdk/hotspot/test/gc/arguments/TestAggressiveHeap.java
|
|
@@ -0,0 +1,91 @@
|
|
+/*
|
|
+ * Copyright (c) 2017, 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.
|
|
+ *
|
|
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
|
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
+ * version 2 for more details (a copy is included in the LICENSE file that
|
|
+ * accompanied this code).
|
|
+ *
|
|
+ * You should have received a copy of the GNU General Public License version
|
|
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
|
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
+ *
|
|
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
+ * or visit www.oracle.com if you need additional information or have any
|
|
+ * questions.
|
|
+ */
|
|
+
|
|
+/*
|
|
+ * @test TestAggressiveHeap
|
|
+ * @key gc
|
|
+ * @bug 8179084
|
|
+ * @summary Test argument processing for -XX:+AggressiveHeap.
|
|
+ * @library /testlibrary
|
|
+ * @run driver TestAggressiveHeap
|
|
+ */
|
|
+
|
|
+import java.lang.management.ManagementFactory;
|
|
+import javax.management.MBeanServer;
|
|
+import javax.management.ObjectName;
|
|
+
|
|
+import com.oracle.java.testlibrary.OutputAnalyzer;
|
|
+import com.oracle.java.testlibrary.ProcessTools;
|
|
+
|
|
+public class TestAggressiveHeap {
|
|
+
|
|
+ public static void main(String args[]) throws Exception {
|
|
+ if (canUseAggressiveHeapOption()) {
|
|
+ testFlag();
|
|
+ }
|
|
+ }
|
|
+
|
|
+ // Note: Not a normal boolean flag; -XX:-AggressiveHeap is invalid.
|
|
+ private static final String option = "-XX:+AggressiveHeap";
|
|
+
|
|
+ // Option requires at least 256M, else error during option processing.
|
|
+ private static final long minMemory = 256 * 1024 * 1024;
|
|
+
|
|
+ // bool UseParallelGC := true {product}
|
|
+ private static final String parallelGCPattern =
|
|
+ " *bool +UseParallelGC *:= *true +\\{product\\}";
|
|
+
|
|
+ private static void testFlag() throws Exception {
|
|
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
|
|
+ option, "-XX:+PrintFlagsFinal", "-version");
|
|
+
|
|
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
|
|
+
|
|
+ output.shouldHaveExitValue(0);
|
|
+
|
|
+ String value = output.firstMatch(parallelGCPattern);
|
|
+ if (value == null) {
|
|
+ throw new RuntimeException(
|
|
+ option + " didn't set UseParallelGC");
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private static boolean haveRequiredMemory() throws Exception {
|
|
+ MBeanServer server = ManagementFactory.getPlatformMBeanServer();
|
|
+ ObjectName os = new ObjectName("java.lang", "type", "OperatingSystem");
|
|
+ Object attr = server.getAttribute(os, "TotalPhysicalMemorySize");
|
|
+ String value = attr.toString();
|
|
+ long memory = Long.parseLong(value);
|
|
+ return memory >= minMemory;
|
|
+ }
|
|
+
|
|
+ private static boolean canUseAggressiveHeapOption() throws Exception {
|
|
+ if (!haveRequiredMemory()) {
|
|
+ System.out.println(
|
|
+ "Skipping test of " + option + " : insufficient memory");
|
|
+ return false;
|
|
+ }
|
|
+ return true;
|
|
+ }
|
|
+}
|
|
+
|