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

We should prefer direct buffers if we can access the cleaner even if sun.misc.Unsafe is not present. (#8233)

Browse Source 
Motivation:

We should prefer direct buffers whenever we can use the cleaner even if sun.misc.Unsafe is not present.

Modifications:

Correctly prefer direct buffers in all cases.

Result:

More correct code.
This commit is contained in:
Norman Maurer 2018-08-29 08:21:07 +02:00 committed by GitHub
parent 8679c5ef43
commit f77891cc17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/java/io/netty/util/internal/PlatformDependent.java
View File

@ -79,8 +79,7 @@ public final class PlatformDependent {
private static final boolean CAN_ENABLE_TCP_NODELAY_BY_DEFAULT = !isAndroid(); private static final boolean CAN_ENABLE_TCP_NODELAY_BY_DEFAULT = !isAndroid();
private static final Throwable UNSAFE_UNAVAILABILITY_CAUSE = unsafeUnavailabilityCause0(); private static final Throwable UNSAFE_UNAVAILABILITY_CAUSE = unsafeUnavailabilityCause0();
private static final boolean DIRECT_BUFFER_PREFERRED = private static final boolean DIRECT_BUFFER_PREFERRED;
UNSAFE_UNAVAILABILITY_CAUSE == null && !SystemPropertyUtil.getBoolean("io.netty.noPreferDirect", false);
private static final long MAX_DIRECT_MEMORY = maxDirectMemory0(); private static final long MAX_DIRECT_MEMORY = maxDirectMemory0();
private static final int MPSC_CHUNK_SIZE = 1024; private static final int MPSC_CHUNK_SIZE = 1024;
@ -128,9 +127,6 @@ public final class PlatformDependent {
} }
}; };
} }
if (logger.isDebugEnabled()) {
logger.debug("-Dio.netty.noPreferDirect: {}", !DIRECT_BUFFER_PREFERRED);
}
/* /*
* We do not want to log this message if unsafe is explicitly disabled. Do not remove the explicit no unsafe * We do not want to log this message if unsafe is explicitly disabled. Do not remove the explicit no unsafe
@ -190,6 +186,13 @@ public final class PlatformDependent {
} else { } else {
CLEANER = NOOP; CLEANER = NOOP;
} }
// We should always prefer direct buffers by default if we can use a Cleaner to release direct buffers.
DIRECT_BUFFER_PREFERRED = CLEANER != NOOP
&& !SystemPropertyUtil.getBoolean("io.netty.noPreferDirect", false);
if (logger.isDebugEnabled()) {
logger.debug("-Dio.netty.noPreferDirect: {}", !DIRECT_BUFFER_PREFERRED);
}
} }
public static boolean hasDirectBufferNoCleanerConstructor() { public static boolean hasDirectBufferNoCleanerConstructor() {