From f2e6ba9b09f46ef7aa5eff0ed6f947e53d0aee0a Mon Sep 17 00:00:00 2001 From: Dmitrij Pochepko Date: Sat, 13 Dec 2014 00:10:55 +0300 Subject: [PATCH 1/4] 8059613: JEP-JDK-8043304: Test task: JMX- tests Reviewed-by: thartmann, twisti --- test/lib/sun/hotspot/code/BlobType.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/lib/sun/hotspot/code/BlobType.java b/test/lib/sun/hotspot/code/BlobType.java index 49d3a0a03d2..905f0ca00d1 100644 --- a/test/lib/sun/hotspot/code/BlobType.java +++ b/test/lib/sun/hotspot/code/BlobType.java @@ -32,11 +32,11 @@ import sun.hotspot.WhiteBox; public enum BlobType { // Execution level 1 and 4 (non-profiled) nmethods (including native nmethods) - MethodNonProfiled(0, "CodeHeap 'non-profiled nmethods'"), + MethodNonProfiled(0, "CodeHeap 'non-profiled nmethods'", "NonProfiledCodeHeapSize"), // Execution level 2 and 3 (profiled) nmethods - MethodProfiled(1, "CodeHeap 'profiled nmethods'"), + MethodProfiled(1, "CodeHeap 'profiled nmethods'", "ProfiledCodeHeapSize"), // Non-nmethods like Buffers, Adapters and Runtime Stubs - NonNMethod(2, "CodeHeap 'non-nmethods'") { + NonNMethod(2, "CodeHeap 'non-nmethods'", "NonNMethodCodeHeapSize") { @Override public boolean allowTypeWhenOverflow(BlobType type) { return super.allowTypeWhenOverflow(type) @@ -44,14 +44,16 @@ public enum BlobType { } }, // All types (No code cache segmentation) - All(3, "CodeCache"); + All(3, "CodeCache", "ReservedCodeCacheSize"); public final int id; - private final String beanName; + public final String sizeOptionName; + public final String beanName; - private BlobType(int id, String beanName) { + private BlobType(int id, String beanName, String sizeOptionName) { this.id = id; this.beanName = beanName; + this.sizeOptionName = sizeOptionName; } public MemoryPoolMXBean getMemoryPool() { @@ -87,4 +89,8 @@ public enum BlobType { } return result; } + + public long getSize() { + return WhiteBox.getWhiteBox().getUintxVMFlag(sizeOptionName); + } } From 0cb9e3ec88f9d98a64e88124a284d907493c6323 Mon Sep 17 00:00:00 2001 From: Filipp Zhinkin Date: Tue, 30 Dec 2014 11:05:01 +0300 Subject: [PATCH 2/4] 8068272: Extend WhiteBox API with methods that check monitor state and force safepoint Reviewed-by: kvn, iignatyev --- test/lib/sun/hotspot/WhiteBox.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java index 4da988a8fd5..b19845392ff 100644 --- a/test/lib/sun/hotspot/WhiteBox.java +++ b/test/lib/sun/hotspot/WhiteBox.java @@ -84,6 +84,8 @@ public class WhiteBox { return isClassAlive0(name.replace('.', '/')); } private native boolean isClassAlive0(String name); + public native boolean isMonitorInflated(Object obj); + public native void forceSafepoint(); // JVMTI public native void addToBootstrapClassLoaderSearch(String segment); From 16f26a80d62309c332427bfecf3359a4c49408af Mon Sep 17 00:00:00 2001 From: Bengt Rutisson Date: Wed, 7 Jan 2015 10:17:45 +0100 Subject: [PATCH 3/4] 8067676: Add applicable closed gc jtreg tests to run in JPRT Reviewed-by: ehelin --- make/jprt.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/make/jprt.properties b/make/jprt.properties index d9cd1498649..805b597d77f 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -486,6 +486,7 @@ my.make.rule.test.targets.hotspot= \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_closed}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \ From f96d05132da703dd96c221b855e66a72cdcc7cb9 Mon Sep 17 00:00:00 2001 From: Bengt Rutisson Date: Wed, 7 Jan 2015 15:02:33 +0100 Subject: [PATCH 4/4] 8067868: Add GCOld as a JTreg test Reviewed-by: kbarrett, dfazunen, ehelin --- make/jprt.properties | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/make/jprt.properties b/make/jprt.properties index 805b597d77f..036a64e6ca2 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -269,11 +269,6 @@ my.test.targets.hotspot.solaris.sparcv9= \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_CMS, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_CMS, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_G1, \ - solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_SerialGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \ @@ -293,17 +288,9 @@ my.test.targets.hotspot.solaris.x64= \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_CMS, \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1, \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_CMS, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_G1, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \ solaris_x64_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \ solaris_x64_5.11-{product|fastdebug}-c2-jbb_SerialGC, \ - solaris_x64_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_CMS, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_G1, \ - solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParOldGC + solaris_x64_5.11-{product|fastdebug}-c2-jbb_ParallelGC, my.test.targets.hotspot.linux.i586= \ linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98, \ @@ -319,11 +306,6 @@ my.test.targets.hotspot.linux.i586= \ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ - linux_i586_2.6-product-{c1|c2}-GCOld_SerialGC, \ - linux_i586_2.6-product-{c1|c2}-GCOld_ParallelGC, \ - linux_i586_2.6-product-{c1|c2}-GCOld_CMS, \ - linux_i586_2.6-product-{c1|c2}-GCOld_G1, \ - linux_i586_2.6-product-{c1|c2}-GCOld_ParOldGC, \ linux_i586_2.6-{product|fastdebug}-c1-jbb_SerialGC, \ linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \ linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC, \ @@ -340,11 +322,6 @@ my.test.targets.hotspot.linux.x64= \ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS, \ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1, \ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParOldGC, \ - linux_x64_2.6-{product|fastdebug}-c2-GCOld_SerialGC, \ - linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParallelGC, \ - linux_x64_2.6-{product|fastdebug}-c2-GCOld_CMS, \ - linux_x64_2.6-{product|fastdebug}-c2-GCOld_G1, \ - linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParOldGC, \ linux_x64_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \ linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC, \ linux_x64_2.6-{product|fastdebug}-c2-jbb_G1, \ @@ -359,11 +336,6 @@ my.test.targets.hotspot.macosx.x64= \ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS, \ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1, \ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC, \ - macosx_x64_10.7-{product|fastdebug}-c2-GCOld_SerialGC, \ - macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParallelGC, \ - macosx_x64_10.7-{product|fastdebug}-c2-GCOld_CMS, \ - macosx_x64_10.7-{product|fastdebug}-c2-GCOld_G1, \ - macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParOldGC, \ macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered, \ macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC, \ macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1, \ @@ -382,11 +354,6 @@ my.test.targets.hotspot.windows.i586= \ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ - windows_i586_6.1-product-{c1|c2}-GCOld_SerialGC, \ - windows_i586_6.1-product-{c1|c2}-GCOld_ParallelGC, \ - windows_i586_6.1-product-{c1|c2}-GCOld_CMS, \ - windows_i586_6.1-product-{c1|c2}-GCOld_G1, \ - windows_i586_6.1-product-{c1|c2}-GCOld_ParOldGC, \ windows_i586_6.1-{product|fastdebug}-{c1|c2}-jbb_default, \ windows_i586_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \ windows_i586_6.1-product-{c1|c2}-jbb_ParallelGC, \ @@ -406,11 +373,6 @@ my.test.targets.hotspot.windows.x64= \ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS, \ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1, \ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC, \ - windows_x64_6.1-{product|fastdebug}-c2-GCOld_SerialGC, \ - windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParallelGC, \ - windows_x64_6.1-{product|fastdebug}-c2-GCOld_CMS, \ - windows_x64_6.1-{product|fastdebug}-c2-GCOld_G1, \ - windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParOldGC, \ windows_x64_6.1-{product|fastdebug}-c2-jbb_default, \ windows_x64_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \ windows_x64_6.1-product-c2-jbb_CMS, \ @@ -487,6 +449,7 @@ my.make.rule.test.targets.hotspot= \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_closed}, \ + ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc_gcold}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed}, \ ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_serviceability}, \