Mercurial > hg > openjdk > jdk9
changeset 1579:dda15fdffd28
Merge
author | jfdenise |
---|---|
date | Thu, 25 Jun 2015 20:47:45 +0000 |
parents | ee017185e18d (current diff) e1e2a0c7cbee (diff) |
children | b3159b5b9342 |
files | |
diffstat | 2 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/modules.xml Thu Jun 25 07:13:27 2015 +0000 +++ b/modules.xml Thu Jun 25 20:47:45 2015 +0000 @@ -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/sun/hotspot/WhiteBox.java Thu Jun 25 07:13:27 2015 +0000 +++ b/test/lib/sun/hotspot/WhiteBox.java Thu Jun 25 20:47:45 2015 +0000 @@ -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);