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

Allow to override how wrapped direct ByteBuffer are allocated to make it easier to extend

Browse Source
This commit is contained in:
Norman Maurer 2013-11-12 12:13:38 +01:00
parent 329bbfcd87
commit 9b7d286652
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buffer/src/main/java/io/netty/buffer/UnpooledDirectByteBuf.java
View File

@ -102,6 +102,13 @@ public class UnpooledDirectByteBuf extends AbstractReferenceCountedByteBuf {
leak = leakDetector.open(this); leak = leakDetector.open(this);
} }
/**
* Allocate a new direct {@link ByteBuffer} with the given initialCapacity.
*/
protected ByteBuffer allocateDirect(int initialCapacity) {
return ByteBuffer.allocateDirect(initialCapacity);
}
private void setByteBuffer(ByteBuffer buffer) { private void setByteBuffer(ByteBuffer buffer) {
ByteBuffer oldBuffer = this.buffer; ByteBuffer oldBuffer = this.buffer;
if (oldBuffer != null) { if (oldBuffer != null) {
@ -140,7 +147,7 @@ public class UnpooledDirectByteBuf extends AbstractReferenceCountedByteBuf {
int oldCapacity = capacity; int oldCapacity = capacity;
if (newCapacity > oldCapacity) { if (newCapacity > oldCapacity) {
ByteBuffer oldBuffer = buffer; ByteBuffer oldBuffer = buffer;
ByteBuffer newBuffer = ByteBuffer.allocateDirect(newCapacity); ByteBuffer newBuffer = allocateDirect(newCapacity);
oldBuffer.position(0).limit(oldBuffer.capacity()); oldBuffer.position(0).limit(oldBuffer.capacity());
newBuffer.position(0).limit(oldBuffer.capacity()); newBuffer.position(0).limit(oldBuffer.capacity());
newBuffer.put(oldBuffer); newBuffer.put(oldBuffer);
@ -148,7 +155,7 @@ public class UnpooledDirectByteBuf extends AbstractReferenceCountedByteBuf {
setByteBuffer(newBuffer); setByteBuffer(newBuffer);
} else if (newCapacity < oldCapacity) { } else if (newCapacity < oldCapacity) {
ByteBuffer oldBuffer = buffer; ByteBuffer oldBuffer = buffer;
ByteBuffer newBuffer = ByteBuffer.allocateDirect(newCapacity); ByteBuffer newBuffer = allocateDirect(newCapacity);
if (readerIndex < newCapacity) { if (readerIndex < newCapacity) {
if (writerIndex > newCapacity) { if (writerIndex > newCapacity) {
writerIndex(writerIndex = newCapacity); writerIndex(writerIndex = newCapacity);
@ -553,7 +560,7 @@ public class UnpooledDirectByteBuf extends AbstractReferenceCountedByteBuf {
} }
ByteBuffer dst = ByteBuffer dst =
src.isDirect()? ByteBuffer.allocateDirect(length) : ByteBuffer.allocate(length); src.isDirect()? allocateDirect(length) : ByteBuffer.allocate(length);
dst.put(src); dst.put(src);
dst.order(order()); dst.order(order());
dst.clear(); dst.clear();

13
buffer/src/main/java/io/netty/buffer/UnpooledUnsafeDirectByteBuf.java
View File

@ -68,7 +68,7 @@ public class UnpooledUnsafeDirectByteBuf extends AbstractReferenceCountedByteBuf
} }
this.alloc = alloc; this.alloc = alloc;
setByteBuffer(ByteBuffer.allocateDirect(initialCapacity)); setByteBuffer(allocateDirect(initialCapacity));
leak = leakDetector.open(this); leak = leakDetector.open(this);
} }
@ -105,6 +105,13 @@ public class UnpooledUnsafeDirectByteBuf extends AbstractReferenceCountedByteBuf
leak = leakDetector.open(this); leak = leakDetector.open(this);
} }
/**
* Allocate a new direct {@link ByteBuffer} with the given initialCapacity.
*/
protected ByteBuffer allocateDirect(int initialCapacity) {
return ByteBuffer.allocateDirect(initialCapacity);
}
private void setByteBuffer(ByteBuffer buffer) { private void setByteBuffer(ByteBuffer buffer) {
ByteBuffer oldBuffer = this.buffer; ByteBuffer oldBuffer = this.buffer;
if (oldBuffer != null) { if (oldBuffer != null) {
@ -144,7 +151,7 @@ public class UnpooledUnsafeDirectByteBuf extends AbstractReferenceCountedByteBuf
int oldCapacity = capacity; int oldCapacity = capacity;
if (newCapacity > oldCapacity) { if (newCapacity > oldCapacity) {
ByteBuffer oldBuffer = buffer; ByteBuffer oldBuffer = buffer;
ByteBuffer newBuffer = ByteBuffer.allocateDirect(newCapacity); ByteBuffer newBuffer = allocateDirect(newCapacity);
oldBuffer.position(0).limit(oldBuffer.capacity()); oldBuffer.position(0).limit(oldBuffer.capacity());
newBuffer.position(0).limit(oldBuffer.capacity()); newBuffer.position(0).limit(oldBuffer.capacity());
newBuffer.put(oldBuffer); newBuffer.put(oldBuffer);
@ -152,7 +159,7 @@ public class UnpooledUnsafeDirectByteBuf extends AbstractReferenceCountedByteBuf
setByteBuffer(newBuffer); setByteBuffer(newBuffer);
} else if (newCapacity < oldCapacity) { } else if (newCapacity < oldCapacity) {
ByteBuffer oldBuffer = buffer; ByteBuffer oldBuffer = buffer;
ByteBuffer newBuffer = ByteBuffer.allocateDirect(newCapacity); ByteBuffer newBuffer = allocateDirect(newCapacity);
if (readerIndex < newCapacity) { if (readerIndex < newCapacity) {
if (writerIndex > newCapacity) { if (writerIndex > newCapacity) {
writerIndex(writerIndex = newCapacity); writerIndex(writerIndex = newCapacity);