Mercurial > hg > jdk9-shenandoah
changeset 1581:e861317f9c07
Merge
author | dcubed |
---|---|
date | Fri, 03 Jul 2015 06:23:29 -0700 |
parents | 2c7ff240d69e (current diff) b3159b5b9342 (diff) |
children | e8c2eba0af51 |
files | make/jprt.properties |
diffstat | 4 files changed, 31 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Thu Jul 02 09:38:41 2015 +0200 +++ b/make/jprt.properties Fri Jul 03 06:23:29 2015 -0700 @@ -121,9 +121,7 @@ ${jprt.fastdebugOpen.build.configure.args} jprt.i586.productOpen.build.configure.args= \ ${my.i586.default.build.configure.args} \ - ${jprt.productOpen.build.configure.args} - -jprt.windows_i586.build.configure.args= \ + ${jprt.productOpen.build.configure.args}jprt.windows_i586.build.configure.args= \ --with-devkit=$VS2013_HOME \ ${jprt.i586.build.configure.args} jprt.windows_x64.build.configure.args= \ @@ -281,12 +279,7 @@ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \ 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-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-GCBasher_G1 my.test.targets.hotspot.solaris.x64= \ solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \ @@ -298,10 +291,7 @@ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \ 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-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-GCBasher_G1 my.test.targets.hotspot.linux.i586= \ linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98, \ @@ -315,12 +305,7 @@ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ 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-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|c2}-GCBasher_G1 my.test.targets.hotspot.linux.x64= \ linux_x64_2.6-{product|fastdebug}-c2-jvm98, \ @@ -329,10 +314,7 @@ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC, \ 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-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-GCBasher_G1 my.test.targets.hotspot.macosx.x64= \ macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \ @@ -341,10 +323,7 @@ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_SerialGC, \ 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-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-GCBasher_G1 my.test.targets.hotspot.windows.i586= \ windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98, \ @@ -357,12 +336,7 @@ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ 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}-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|fastdebug}-{c1|c2}-GCBasher_G1 my.test.targets.hotspot.windows.x64= \ windows_x64_6.2-{product|fastdebug}-c2-jvm98, \ @@ -374,12 +348,7 @@ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_SerialGC, \ 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-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|fastdebug}-c2-GCBasher_G1 # Some basic "smoke" tests for OpenJDK builds my.test.targets.hotspot.open= \
--- a/modules.xml Thu Jul 02 09:38:41 2015 +0200 +++ b/modules.xml Fri Jul 03 06:23:29 2015 -0700 @@ -219,6 +219,10 @@ <to>jdk.dev</to> </export> <export> + <name>jdk.internal.jimage.decompressor</name> + <to>jdk.dev</to> + </export> + <export> <name>jdk.internal.org.objectweb.asm</name> <to>java.instrument</to> <to>jdk.jfr</to>
--- a/test/lib/Makefile Thu Jul 02 09:38:41 2015 +0200 +++ b/test/lib/Makefile Fri Jul 03 06:23:29 2015 -0700 @@ -8,7 +8,7 @@ # # 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 +# 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). #
--- a/test/lib/sun/hotspot/WhiteBox.java Thu Jul 02 09:38:41 2015 +0200 +++ b/test/lib/sun/hotspot/WhiteBox.java Fri Jul 03 06:23:29 2015 -0700 @@ -26,6 +26,7 @@ import java.lang.management.MemoryUsage; import java.lang.reflect.Executable; +import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; import java.util.function.BiFunction; @@ -37,7 +38,6 @@ import sun.hotspot.parser.DiagnosticCommand; public class WhiteBox { - @SuppressWarnings("serial") public static class WhiteBoxPermission extends BasicPermission { public WhiteBoxPermission(String s) { @@ -362,6 +362,23 @@ .orElse(null); } + public native boolean readImageFile(String imagePath); + public native long imageOpenImage(String imagePath, boolean bigEndian); + public native void imageCloseImage(long id); + public native long imageGetIndexAddress(long id); + public native long imageGetDataAddress(long id); + public native boolean imageReadCompressed(long id, long offset, + ByteBuffer compressedBuffer, long compressedSize, + ByteBuffer uncompressedBuffer, long uncompressedSize); + public native boolean imageRead(long id, long offset, + ByteBuffer uncompressedBuffer, long uncompressedSize); + public native byte[] imageGetStringBytes(long id, int offset); + public native long imageGetStringsSize(long id); + public native long[] imageGetAttributes(long id, int offset); + public native long[] imageFindAttributes(long id, byte[] path); + public native int[] imageAttributeOffsets(long id); + public native int imageGetIntAtAddress(long address, int offset, boolean big_endian); + // Safepoint Checking public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue);