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

Merge

Browse Source
This commit is contained in:
Alejandro Murillo 2015-07-09 22:46:15 -07:00
commit 33ab883a0c
4 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
make/jprt.properties
View File

@ -61,7 +61,7 @@ jprt.build.flavor.optimizedOpen.target=jprt_bundle
# Use these configure args to define debug level
jprt.debug.build.configure.args=--with-debug-level=slowdebug
jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug --disable-precompiled-headers
jprt.product.build.configure.args=--with-debug-level=release
jprt.optimized.build.configure.args=--with-debug-level=optimized
jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
@ -121,9 +121,7 @@ jprt.i586.fastdebugOpen.build.configure.args= \
${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 @@ my.test.targets.hotspot.solaris.sparcv9= \
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 @@ my.test.targets.hotspot.solaris.x64= \
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 @@ my.test.targets.hotspot.linux.i586= \
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 @@ my.test.targets.hotspot.linux.x64= \
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 @@ my.test.targets.hotspot.macosx.x64= \
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 @@ my.test.targets.hotspot.windows.i586= \
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 @@ my.test.targets.hotspot.windows.x64= \
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= \

8
modules.xml
View File

@ -218,6 +218,10 @@
<name>jdk.internal.jimage</name>
<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>
@ -245,6 +249,10 @@
<to>jdk.jfr</to>
<to>jdk.scripting.nashorn</to>
</export>
<export>
<name>jdk.internal</name>
<to>jdk.jfr</to>
</export>
<export>
<name>sun.misc</name>
<to>java.corba</to>

2
test/lib/Makefile
View File

@ -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).
#

19
test/lib/sun/hotspot/WhiteBox.java
View File

@ -26,6 +26,7 @@ package sun.hotspot;
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 java.util.Objects;
import sun.hotspot.parser.DiagnosticCommand;
public class WhiteBox {
@SuppressWarnings("serial")
public static class WhiteBoxPermission extends BasicPermission {
public WhiteBoxPermission(String s) {
@ -362,6 +362,23 @@ public class WhiteBox {
.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);