From 2aebdad393fe3f11c709fd97d7e55f5a03d2776d Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Fri, 12 Jun 2015 17:03:04 -0400
Subject: [PATCH 1/5] 8015086: add interned strings to the shared archive
Support saving interned strings in shared CDS archive.
Reviewed-by: coleenp, iklam, pliden
---
test/lib/sun/hotspot/WhiteBox.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
index 2cd3d670295..1df21011ee8 100644
--- a/test/lib/sun/hotspot/WhiteBox.java
+++ b/test/lib/sun/hotspot/WhiteBox.java
@@ -363,4 +363,7 @@ public class WhiteBox {
// Safepoint Checking
public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue);
+
+ // Sharing
+ public native boolean isShared(Object o);
}
From 8993ac36f0341e08a43beae38147958cc6e8dc65 Mon Sep 17 00:00:00 2001
From: Mikhailo Seledtsov <mseledtsov@openjdk.org>
Date: Wed, 17 Jun 2015 21:43:26 +0000
Subject: [PATCH 2/5] 8098821: Crash in system dictionary initialization with
shared strings
Map string regions after the compressed class base is known
Reviewed-by: iklam, dcubed, coleenp
---
test/lib/sun/hotspot/WhiteBox.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
index 1df21011ee8..8e081286d01 100644
--- a/test/lib/sun/hotspot/WhiteBox.java
+++ b/test/lib/sun/hotspot/WhiteBox.java
@@ -366,4 +366,5 @@ public class WhiteBox {
// Sharing
public native boolean isShared(Object o);
+ public native boolean areSharedStringsIgnored();
}
From c62e4b8ee30fe718d01caf2b662847a8840c8e8a Mon Sep 17 00:00:00 2001
From: Dmitry Samersoff <dsamersoff@openjdk.org>
Date: Tue, 23 Jun 2015 12:30:57 +0300
Subject: [PATCH 3/5] 8081576: serviceability/sa tests fail due to LingeredApp
process fails to start
Provide a API to corrctly terminate LingeredApp
Reviewed-by: sspitsyn
---
.../jdk/test/lib/apps/LingeredApp.java | 32 ++++++++++++-------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java b/test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java
index 513c40e4c78..bed68068a5b 100644
--- a/test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java
+++ b/test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java
@@ -287,7 +287,7 @@ public class LingeredApp {
}
}
else{
- // Lets user manage LingerApp options
+ // Lets user manage LingeredApp options
cmd.addAll(vmArguments);
}
@@ -320,6 +320,20 @@ public class LingeredApp {
gb.start();
}
+ /**
+ * Delete lock file that signals app to terminate, then
+ * wait until app is actually terminated.
+ * @throws IOException
+ */
+ public void stopApp() throws IOException {
+ deleteLock();
+ waitAppTerminate();
+ int exitcode = appProcess.exitValue();
+ if (exitcode != 0) {
+ throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode);
+ }
+ }
+
/**
* High level interface for test writers
*/
@@ -351,17 +365,11 @@ public class LingeredApp {
return startApp(null);
}
- /**
- * Delete lock file that signal app to terminate, then
- * waits until app is actually terminated.
- * @throws IOException
- */
- public void stopApp() throws IOException {
- deleteLock();
- waitAppTerminate();
- int exitcode = appProcess.exitValue();
- if (exitcode != 0) {
- throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode);
+ public static void stopApp(LingeredApp app) throws IOException {
+ if (app != null) {
+ // LingeredApp can throw an exception during the intialization,
+ // make sure we don't have cascade NPE
+ app.stopApp();
}
}
From 32a2354292b7b606caa2fba7d2d5a4447d22946c Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Tue, 23 Jun 2015 10:20:10 -0700
Subject: [PATCH 4/5] 8129518: Remove ParOldGC tests from the jprt hotspot
testset
Reviewed-by: dholmes, brutisso
---
make/jprt.properties | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/make/jprt.properties b/make/jprt.properties
index ef3a45d000e..c24a28f1cfd 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -282,13 +282,11 @@ my.test.targets.hotspot.solaris.sparcv9= \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
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-jbb_default_nontiered, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_CMS, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_G1, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParOldGC
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_G1
my.test.targets.hotspot.solaris.x64= \
solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \
@@ -301,7 +299,6 @@ my.test.targets.hotspot.solaris.x64= \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
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-jbb_default_nontiered, \
solaris_x64_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
solaris_x64_5.11-{product|fastdebug}-c2-jbb_ParallelGC,
@@ -319,13 +316,11 @@ my.test.targets.hotspot.linux.i586= \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
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|fastdebug}-c1-jbb_SerialGC, \
linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \
linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC, \
linux_i586_2.6-{product|fastdebug}-c1-jbb_CMS, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_G1, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_ParOldGC
+ linux_i586_2.6-{product|fastdebug}-c1-jbb_G1
my.test.targets.hotspot.linux.x64= \
linux_x64_2.6-{product|fastdebug}-c2-jvm98, \
@@ -335,11 +330,9 @@ my.test.targets.hotspot.linux.x64= \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC, \
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-jbb_default_nontiered, \
linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_G1, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
+ linux_x64_2.6-{product|fastdebug}-c2-jbb_G1
my.test.targets.hotspot.macosx.x64= \
macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \
@@ -349,11 +342,9 @@ my.test.targets.hotspot.macosx.x64= \
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC, \
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS, \
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1, \
- macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParOldGC, \
macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered, \
macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1
my.test.targets.hotspot.windows.i586= \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -367,13 +358,11 @@ my.test.targets.hotspot.windows.i586= \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
- windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-jbb_default, \
windows_i586_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
windows_i586_6.2-product-{c1|c2}-jbb_ParallelGC, \
windows_i586_6.2-product-{c1|c2}-jbb_CMS, \
- windows_i586_6.2-product-{c1|c2}-jbb_G1, \
- windows_i586_6.2-product-{c1|c2}-jbb_ParOldGC
+ windows_i586_6.2-product-{c1|c2}-jbb_G1
my.test.targets.hotspot.windows.x64= \
windows_x64_6.2-{product|fastdebug}-c2-jvm98, \
@@ -386,13 +375,11 @@ my.test.targets.hotspot.windows.x64= \
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParallelGC, \
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_CMS, \
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1, \
- windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParOldGC, \
windows_x64_6.2-{product|fastdebug}-c2-jbb_default, \
windows_x64_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
windows_x64_6.2-product-c2-jbb_CMS, \
windows_x64_6.2-product-c2-jbb_ParallelGC, \
- windows_x64_6.2-product-c2-jbb_G1, \
- windows_x64_6.2-product-c2-jbb_ParOldGC
+ windows_x64_6.2-product-c2-jbb_G1
# Some basic "smoke" tests for OpenJDK builds
my.test.targets.hotspot.open= \
From 4fe28ee3186130127368fbd51c3c92d3bce24814 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 24 Jun 2015 09:41:11 +0200
Subject: [PATCH 5/5] 8079208: gc/g1/TestLargePageUseForAuxMemory.java fails
due to not considering page allocation granularity for setup
The test case needs to use the OS'es allocation granularity to properly determine the boundary values for the test.
Reviewed-by: dfazunen, jmasa, ecaspole
---
test/lib/sun/hotspot/WhiteBox.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
index 8e081286d01..0121ca4fecc 100644
--- a/test/lib/sun/hotspot/WhiteBox.java
+++ b/test/lib/sun/hotspot/WhiteBox.java
@@ -83,6 +83,7 @@ public class WhiteBox {
public native int getHeapOopSize();
public native int getVMPageSize();
+ public native long getVMAllocationGranularity();
public native long getVMLargePageSize();
private native boolean isObjectInOldGen0(Object o);