stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8204173: Lower the minimum number of heap memory pools in MemoryTest.java

Browse Source 
Reviewed-by: mchung, sjohanss
This commit is contained in:
Stefan Karlsson 2018-06-05 15:56:23 +02:00
parent ad35b3d424
commit fcfd260c1f
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/jdk/java/lang/management/MemoryMXBean/MemoryTest.java
View File

@ -29,7 +29,7 @@
* @author Mandy Chung * @author Mandy Chung
* *
* @modules jdk.management * @modules jdk.management
* @run main MemoryTest 2 * @run main MemoryTest 2 3
*/ */
/* /*
@ -65,17 +65,24 @@ public class MemoryTest {
// - Code cache (between one and three depending on the -XX:SegmentedCodeCache option) // - Code cache (between one and three depending on the -XX:SegmentedCodeCache option)
// - Metaspace // - Metaspace
// - Compressed Class Space (if compressed class pointers are used) // - Compressed Class Space (if compressed class pointers are used)
private static int[] expectedMinNumPools = {3, 2};
private static int[] expectedMaxNumPools = {3, 5}; private static int[] expectedMinNumPools = new int[2];
private static int expectedNumGCMgrs = 2; private static int[] expectedMaxNumPools = new int[2];
private static int expectedNumMgrs = expectedNumGCMgrs + 2; private static int expectedNumGCMgrs;
private static int expectedNumMgrs;
private static String[] types = { "heap", "non-heap" }; private static String[] types = { "heap", "non-heap" };
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
Integer value = new Integer(args[0]); expectedNumGCMgrs = Integer.valueOf(args[0]);
expectedNumGCMgrs = value.intValue();
expectedNumMgrs = expectedNumGCMgrs + 2; expectedNumMgrs = expectedNumGCMgrs + 2;
int expectedNumPools = Integer.valueOf(args[1]);
expectedMinNumPools[HEAP] = expectedNumPools;
expectedMaxNumPools[HEAP] = expectedNumPools;
expectedMinNumPools[NONHEAP] = 2;
expectedMaxNumPools[NONHEAP] = 5;
checkMemoryPools(); checkMemoryPools();
checkMemoryManagers(); checkMemoryManagers();
if (testFailed) if (testFailed)

4
test/jdk/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh
View File

@ -49,10 +49,10 @@ runOne()
} }
# Test MemoryTest with default collector # Test MemoryTest with default collector
runOne MemoryTest 2 runOne MemoryTest 2 3
# Test MemoryTest with parallel scavenger collector # Test MemoryTest with parallel scavenger collector
runOne -XX:+UseParallelGC MemoryTest 2 runOne -XX:+UseParallelGC MemoryTest 2 3
exit 0 exit 0