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

Allow to disable leak detection for all buffers when using UnpooledByteBufAllocator.

Browse Source 
Motivation:

Sometimes it is useful to allow to disable the leak detection of buffers if the UnpooledByteBufAllocator is used. This is for example true if the app wants to leak buffers into user code but not want to put the burden on the user to always release the buffer.

Modifications:

Add another constructor to UnpooledByteBufAllocator that allows to completely disable leak-detection for all buffers that are allocator out of the UnpooledByteBufAllocator.

Result:

It's possible to disable leak-detection when the UnpooledByteBufAllocator is used.
This commit is contained in:
Norman Maurer 2016-03-29 12:00:58 +02:00
parent 5a0d0daed3
commit 6a1c5611ab
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
buffer/src/main/java/io/netty/buffer/UnpooledByteBufAllocator.java
View File

@ -22,20 +22,36 @@ import io.netty.util.internal.PlatformDependent;
*/ */
public final class UnpooledByteBufAllocator extends AbstractByteBufAllocator { public final class UnpooledByteBufAllocator extends AbstractByteBufAllocator {
private final boolean disableLeakDetector;
/** /**
* Default instance * Default instance which uses leak-detection for direct buffers.
*/ */
public static final UnpooledByteBufAllocator DEFAULT = public static final UnpooledByteBufAllocator DEFAULT =
new UnpooledByteBufAllocator(PlatformDependent.directBufferPreferred()); new UnpooledByteBufAllocator(PlatformDependent.directBufferPreferred());
/**
* Create a new instance which uses leak-detection for direct buffers.
*
* @param preferDirect {@code true} if {@link #buffer(int)} should try to allocate a direct buffer rather than
* a heap buffer
*/
public UnpooledByteBufAllocator(boolean preferDirect) {
this(preferDirect, false);
}
/** /**
* Create a new instance * Create a new instance
* *
* @param preferDirect {@code true} if {@link #buffer(int)} should try to allocate a direct buffer rather than * @param preferDirect {@code true} if {@link #buffer(int)} should try to allocate a direct buffer rather than
* a heap buffer * a heap buffer
* @param disableLeakDetector {@code true} if the leak-detection should be disabled completely for this
* allocator. This can be useful if the user just want to depend on the GC to handle
* direct buffers when not explicit released.
*/ */
public UnpooledByteBufAllocator(boolean preferDirect) { public UnpooledByteBufAllocator(boolean preferDirect, boolean disableLeakDetector) {
super(preferDirect); super(preferDirect);
this.disableLeakDetector = disableLeakDetector;
} }
@Override @Override
@ -46,14 +62,23 @@ public final class UnpooledByteBufAllocator extends AbstractByteBufAllocator {
@Override @Override
protected ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity) { protected ByteBuf newDirectBuffer(int initialCapacity, int maxCapacity) {
ByteBuf buf; ByteBuf buf = PlatformDependent.hasUnsafe() ?
if (PlatformDependent.hasUnsafe()) { new UnpooledUnsafeDirectByteBuf(this, initialCapacity, maxCapacity) :
buf = new UnpooledUnsafeDirectByteBuf(this, initialCapacity, maxCapacity); new UnpooledDirectByteBuf(this, initialCapacity, maxCapacity);
} else {
buf = new UnpooledDirectByteBuf(this, initialCapacity, maxCapacity);
}
return toLeakAwareBuffer(buf); return disableLeakDetector ? buf : toLeakAwareBuffer(buf);
}
@Override
public CompositeByteBuf compositeHeapBuffer(int maxNumComponents) {
CompositeByteBuf buf = new CompositeByteBuf(this, false, maxNumComponents);
return disableLeakDetector ? buf : toLeakAwareBuffer(buf);
}
@Override
public CompositeByteBuf compositeDirectBuffer(int maxNumComponents) {
CompositeByteBuf buf = new CompositeByteBuf(this, true, maxNumComponents);
return disableLeakDetector ? buf : toLeakAwareBuffer(buf);
} }
@Override @Override