changeset 16292:adc00ab4ac58

8171377: Add sun.misc.Unsafe::invokeCleaner Reviewed-by: alanb, plevart
author chegar
date Fri, 16 Dec 2016 17:20:37 +0000
parents d4fe8dcfd6e7
children a3539d97b127
files src/java.base/share/classes/jdk/internal/ref/Cleaner.java src/java.base/share/classes/module-info.java src/jdk.unsupported/share/classes/sun/misc/Unsafe.java test/sun/misc/InvokeCleaner.java
diffstat 4 files changed, 155 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/jdk/internal/ref/Cleaner.java	Fri Dec 16 14:32:51 2016 +0000
+++ b/src/java.base/share/classes/jdk/internal/ref/Cleaner.java	Fri Dec 16 17:20:37 2016 +0000
@@ -58,7 +58,6 @@
 
 public class Cleaner
     extends PhantomReference<Object>
-    implements Runnable
 {
 
     // Dummy reference queue, needed because the PhantomReference constructor
@@ -153,12 +152,4 @@
                     }});
         }
     }
-
-    @Override public void run() {
-        SecurityManager security = System.getSecurityManager();
-        if (security != null)
-            security.checkPackageAccess("jdk.internal.ref");
-        this.clean();
-    }
-
 }
--- a/src/java.base/share/classes/module-info.java	Fri Dec 16 14:32:51 2016 +0000
+++ b/src/java.base/share/classes/module-info.java	Fri Dec 16 17:20:37 2016 +0000
@@ -180,7 +180,8 @@
         java.management,
         jdk.jvmstat;
     exports jdk.internal.ref to
-        java.desktop;
+        java.desktop,
+        jdk.unsupported;
     exports jdk.internal.reflect to
         java.corba,
         java.logging,
@@ -219,7 +220,8 @@
     exports sun.nio.ch to
         java.management,
         jdk.crypto.token,
-        jdk.sctp;
+        jdk.sctp,
+        jdk.unsupported;
     exports sun.nio.cs to
         java.desktop,
         jdk.charsets;
--- a/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java	Fri Dec 16 14:32:51 2016 +0000
+++ b/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java	Fri Dec 16 17:20:37 2016 +0000
@@ -27,8 +27,10 @@
 
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.misc.VM;
+import jdk.internal.ref.Cleaner;
 import jdk.internal.reflect.CallerSensitive;
 import jdk.internal.reflect.Reflection;
+import sun.nio.ch.DirectBuffer;
 
 import java.lang.reflect.Field;
 import java.security.ProtectionDomain;
@@ -1228,4 +1230,28 @@
     public void fullFence() {
         theInternalUnsafe.fullFence();
     }
+
+    /**
+     * Invokes the given direct byte buffer's cleaner, if any.
+     *
+     * @param directBuffer a direct byte buffer
+     * @throws NullPointerException if {@code directBuffer} is null
+     * @throws IllegalArgumentException if {@code directBuffer} is non-direct,
+     * or is a {@link java.nio.Buffer#slice slice}, or is a
+     * {@link java.nio.Buffer#duplicate duplicate}
+     * @since 9
+     */
+    public void invokeCleaner(java.nio.ByteBuffer directBuffer) {
+        if (!directBuffer.isDirect())
+            throw new IllegalArgumentException("buffer is non-direct");
+
+        DirectBuffer db = (DirectBuffer)directBuffer;
+        if (db.attachment() != null)
+            throw new IllegalArgumentException("duplicate or slice");
+
+        Cleaner cleaner = db.cleaner();
+        if (cleaner != null) {
+            cleaner.clean();
+        }
+    }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/misc/InvokeCleaner.java	Fri Dec 16 17:20:37 2016 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8171377
+ * @summary Basic test for Unsafe::invokeCleaner
+ * @modules jdk.unsupported
+ * @run testng/othervm InvokeCleaner
+ */
+
+import java.io.Closeable;
+import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import sun.misc.Unsafe;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
+
+public class InvokeCleaner {
+
+    static Unsafe UNSAFE;
+    static Path bob = Paths.get("bob");
+    static List<Closeable> closeables = new ArrayList<>();
+
+    @BeforeClass
+    static void init() throws Exception {
+        UNSAFE = getUnsafe();
+
+        byte[] srcData = new byte[20];
+        for (int i=0; i<20; i++)
+            srcData[i] = (byte)i;
+        Files.write(bob, srcData);
+    }
+
+    @DataProvider(name = "badBuffers")
+    static Object[][] createBadBuffers() throws Exception {
+        FileChannel fc = FileChannel.open(bob);
+        closeables.add(fc);
+        MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10);
+
+        return new Object[][] {
+                { ByteBuffer.allocate(0) },
+                { ByteBuffer.allocate(10) },
+                { ByteBuffer.allocate(10).duplicate() },
+                { ByteBuffer.allocate(10).slice() },
+                { ByteBuffer.allocateDirect(10).duplicate() },
+                { ByteBuffer.allocateDirect(10).slice() },
+                { ByteBuffer.allocateDirect(0).duplicate() },
+                { ByteBuffer.allocateDirect(0).slice() },
+                { mbb.duplicate() },
+                { mbb.slice() }
+        };
+    }
+
+    @Test(dataProvider="badBuffers",
+          expectedExceptions = IllegalArgumentException.class)
+    public void badBuffers(ByteBuffer buffer) throws Exception {
+        UNSAFE.invokeCleaner(buffer);
+    }
+
+    @DataProvider(name = "goodBuffers")
+    static Object[][] createGoodBuffers() throws Exception {
+        FileChannel fc = FileChannel.open(bob);
+        closeables.add(fc);
+        MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10);
+        mbb.load();
+
+        return new Object[][] {
+                { ByteBuffer.allocateDirect(0) },
+                { ByteBuffer.allocateDirect(10) },
+                { mbb },
+                { fc.map(FileChannel.MapMode.READ_ONLY, 1, 11) }
+        };
+    }
+
+    @Test(dataProvider="goodBuffers")
+    public void goodBuffers(ByteBuffer buffer) throws Exception {
+        UNSAFE.invokeCleaner(buffer);
+    }
+
+    @Test(expectedExceptions = NullPointerException.class)
+    public void npe() throws Exception {
+        UNSAFE.invokeCleaner(null);
+    }
+
+    static Unsafe getUnsafe() throws ReflectiveOperationException {
+        Field f = Unsafe.class.getDeclaredField("theUnsafe");
+        f.setAccessible(true);
+        return (Unsafe)f.get(null);
+    }
+
+    @AfterClass
+    public void cleanup() throws Exception {
+        for(Closeable fc : closeables)
+            fc.close();
+    }
+}