aboutsummaryrefslogtreecommitdiffstats
path: root/src/junit/com
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-08-19 02:58:22 +0200
committerSven Gothel <[email protected]>2019-08-19 02:58:22 +0200
commit6603026f1bfec02e3486c52270a09a355a1bf914 (patch)
tree3017ab1e5060867ce5b7c816fc7f6621358df29e /src/junit/com
parent5f4292bb8a310489e05a4f3545ae081310a93f72 (diff)
Bug 1363: Java 11: Resolve Buffers.Cleaner implementation
As of Java9, sun.misc.Cleaner has moved to jdk.internal.ref.Cleaner. However, access has been made (under the table) via sun.misc.Unsafe, which we are using for now as we cannot set the jdk.internal.ref.Cleaner method accessible. In this regard, we had to change our Cleaner.clean(..) method using a ByteBuffer instead of a Buffer object paramter. All tests have passed, no more illegal access case running on Java11 has been exposed.
Diffstat (limited to 'src/junit/com')
-rw-r--r--src/junit/com/jogamp/common/nio/TestBuffers.java (renamed from src/junit/com/jogamp/common/nio/BuffersTest.java)10
-rw-r--r--src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java11
-rw-r--r--src/junit/com/jogamp/common/nio/TestCachedBufferFactory.java (renamed from src/junit/com/jogamp/common/nio/CachedBufferFactoryTest.java)6
3 files changed, 22 insertions, 5 deletions
diff --git a/src/junit/com/jogamp/common/nio/BuffersTest.java b/src/junit/com/jogamp/common/nio/TestBuffers.java
index c267100..89b5671 100644
--- a/src/junit/com/jogamp/common/nio/BuffersTest.java
+++ b/src/junit/com/jogamp/common/nio/TestBuffers.java
@@ -53,7 +53,7 @@ import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class BuffersTest extends SingletonJunitCase {
+public class TestBuffers extends SingletonJunitCase {
@Test
public void test01PositionLimitCapacityAfterArrayAllocation() {
@@ -156,8 +156,14 @@ public class BuffersTest extends SingletonJunitCase {
assertEquals(42, onetwothree.get(2));
}
+ @Test
+ public void test20Cleaner() {
+ final ByteBuffer byteBuffer = Buffers.newDirectByteBuffer(1024);
+ Buffers.Cleaner.clean(byteBuffer);
+ }
+
public static void main(final String args[]) throws IOException {
- final String tstname = BuffersTest.class.getName();
+ final String tstname = TestBuffers.class.getName();
org.junit.runner.JUnitCore.main(tstname);
}
}
diff --git a/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java b/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java
index 9524e91..aef0d3e 100644
--- a/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java
+++ b/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java
@@ -52,6 +52,8 @@ public class TestByteBufferCopyStream extends SingletonJunitCase {
final MappedByteBufferInputStream.CacheMode srcCacheMode, final int srcSliceShift,
final String dstFileName,
final MappedByteBufferInputStream.CacheMode dstCacheMode, final int dstSliceShift ) throws IOException {
+ System.err.println("Test: source[CacheMode "+srcCacheMode+", SliceShift "+srcSliceShift+"]");
+ System.err.println(" destin[CacheMode "+dstCacheMode+", SliceShift "+dstSliceShift+"]");
final Runtime runtime = Runtime.getRuntime();
final long[] usedMem0 = { 0 };
final long[] freeMem0 = { 0 };
@@ -60,6 +62,7 @@ public class TestByteBufferCopyStream extends SingletonJunitCase {
final String prefix = "test "+String.format(TestByteBufferInputStream.PrintPrecision+" MiB", size/TestByteBufferInputStream.MIB);
TestByteBufferInputStream.dumpMem(prefix+" before", runtime, -1, -1, usedMem0, freeMem0 );
+ final long t0 = Platform.currentTimeMillis();
final File srcFile = new File(srcFileName);
srcFile.delete();
srcFile.createNewFile();
@@ -72,6 +75,7 @@ public class TestByteBufferCopyStream extends SingletonJunitCase {
_input.close();
input = new RandomAccessFile(srcFile, "r");
}
+ final long t1 = Platform.currentTimeMillis();
final MappedByteBufferInputStream mis = new MappedByteBufferInputStream(input.getChannel(),
FileChannel.MapMode.READ_ONLY,
srcCacheMode,
@@ -131,12 +135,19 @@ public class TestByteBufferCopyStream extends SingletonJunitCase {
output.close();
srcFile.delete();
dstFile.delete();
+ final long t5 = Platform.currentTimeMillis();
TestByteBufferInputStream.dumpMem(prefix+" after ", runtime, usedMem0[0], freeMem0[0], usedMem1, freeMem1 );
System.gc();
+ final long t6 = Platform.currentTimeMillis();
try {
Thread.sleep(500);
} catch (final InterruptedException e) { }
TestByteBufferInputStream.dumpMem(prefix+" gc'ed ", runtime, usedMem0[0], freeMem0[0], usedMem1, freeMem1 );
+ System.err.println("Performance Stats: ");
+ System.err.printf("- File-Create %6d ms\n", t1-t0);
+ System.err.printf("- File-Copy %6d ms\n", t5-t1);
+ System.err.printf("- GC %6d ms\n", t6-t5);
+ System.err.printf("- Total %6d ms\n", t6-t0);
}
if( null != ioe || null != oome ) {
if( null != oome ) {
diff --git a/src/junit/com/jogamp/common/nio/CachedBufferFactoryTest.java b/src/junit/com/jogamp/common/nio/TestCachedBufferFactory.java
index 6b9409f..6ed1b91 100644
--- a/src/junit/com/jogamp/common/nio/CachedBufferFactoryTest.java
+++ b/src/junit/com/jogamp/common/nio/TestCachedBufferFactory.java
@@ -55,7 +55,7 @@ import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class CachedBufferFactoryTest extends SingletonJunitCase {
+public class TestCachedBufferFactory extends SingletonJunitCase {
private final int BUFFERCOUNT = 120;
@@ -210,7 +210,7 @@ public class CachedBufferFactoryTest extends SingletonJunitCase {
public static void main(final String[] args) {
- CachedBufferFactoryTest test = new CachedBufferFactoryTest();
+ TestCachedBufferFactory test = new TestCachedBufferFactory();
out.print("warmup...");
Object obj = null;
@@ -221,7 +221,7 @@ public class CachedBufferFactoryTest extends SingletonJunitCase {
}
out.println("done");
- test = new CachedBufferFactoryTest();
+ test = new TestCachedBufferFactory();
gc();
for (int i = 0; i < 10; i++) {