andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify the acquisition of Cleaner

Browse Source
This commit is contained in:
MiddleBen 2014-01-26 23:21:39 +08:00 committed by Trustin Lee
parent 0bf5ca22cb
commit 6e8ba291cf
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/io/netty/util/internal/PlatformDependent0.java
View File

@ -19,6 +19,7 @@ import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import sun.misc.Cleaner; import sun.misc.Cleaner;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import sun.nio.ch.DirectBuffer;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -34,10 +35,7 @@ final class PlatformDependent0 {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(PlatformDependent0.class); private static final InternalLogger logger = InternalLoggerFactory.getInstance(PlatformDependent0.class);
private static final Unsafe UNSAFE; private static final Unsafe UNSAFE;
private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN; private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
private static final long CLEANER_FIELD_OFFSET;
private static final long ADDRESS_FIELD_OFFSET; private static final long ADDRESS_FIELD_OFFSET;
private static final Field CLEANER_FIELD;
/** /**
* {@code true} if and only if the platform supports unaligned access. * {@code true} if and only if the platform supports unaligned access.
@ -57,7 +55,6 @@ final class PlatformDependent0 {
} catch (Throwable t) { } catch (Throwable t) {
cleanerField = null; cleanerField = null;
} }
CLEANER_FIELD = cleanerField;
logger.debug("java.nio.ByteBuffer.cleaner: {}", cleanerField != null? "available" : "unavailable"); logger.debug("java.nio.ByteBuffer.cleaner: {}", cleanerField != null? "available" : "unavailable");
Field addressField; Field addressField;
@ -114,13 +111,10 @@ final class PlatformDependent0 {
UNSAFE = unsafe; UNSAFE = unsafe;
if (unsafe == null) { if (unsafe == null) {
CLEANER_FIELD_OFFSET = -1;
ADDRESS_FIELD_OFFSET = -1; ADDRESS_FIELD_OFFSET = -1;
UNALIGNED = false; UNALIGNED = false;
} else { } else {
ADDRESS_FIELD_OFFSET = objectFieldOffset(addressField); ADDRESS_FIELD_OFFSET = objectFieldOffset(addressField);
CLEANER_FIELD_OFFSET = objectFieldOffset(cleanerField);
boolean unaligned; boolean unaligned;
try { try {
Class<?> bitsClass = Class.forName("java.nio.Bits", false, ClassLoader.getSystemClassLoader()); Class<?> bitsClass = Class.forName("java.nio.Bits", false, ClassLoader.getSystemClassLoader());
@ -148,9 +142,8 @@ final class PlatformDependent0 {
} }
static void freeDirectBufferUnsafe(ByteBuffer buffer) { static void freeDirectBufferUnsafe(ByteBuffer buffer) {
Cleaner cleaner;
try { try {
cleaner = (Cleaner) getObject(buffer, CLEANER_FIELD_OFFSET); Cleaner cleaner = ((DirectBuffer) buffer).cleaner();
if (cleaner == null) { if (cleaner == null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"attempted to deallocate the buffer which was allocated via JNIEnv->NewDirectByteBuffer()"); "attempted to deallocate the buffer which was allocated via JNIEnv->NewDirectByteBuffer()");
@ -162,11 +155,11 @@ final class PlatformDependent0 {
} }
static void freeDirectBuffer(ByteBuffer buffer) { static void freeDirectBuffer(ByteBuffer buffer) {
if (CLEANER_FIELD == null) { if (!(buffer instanceof DirectBuffer)) {
return; return;
} }
try { try {
Cleaner cleaner = (Cleaner) CLEANER_FIELD.get(buffer); Cleaner cleaner = ((DirectBuffer) buffer).cleaner();
if (cleaner == null) { if (cleaner == null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"attempted to deallocate the buffer which was allocated via JNIEnv->NewDirectByteBuffer()"); "attempted to deallocate the buffer which was allocated via JNIEnv->NewDirectByteBuffer()");