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

Revert "[#2762] Not expand ByteBuffer[] in ChannelOutboundBuffer"

Browse Source 
This reverts commit de3c0507c1 as it may cause problem if a CompositeByteBuf has more then 1024 components.
This commit is contained in:
Norman Maurer 2014-08-13 16:40:34 +02:00
parent ef572d859d
commit f89907dba5
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
View File

@ -46,10 +46,6 @@ public final class ChannelOutboundBuffer {
private static final FastThreadLocal<ByteBuffer[]> NIO_BUFFERS = new FastThreadLocal<ByteBuffer[]>() { private static final FastThreadLocal<ByteBuffer[]> NIO_BUFFERS = new FastThreadLocal<ByteBuffer[]>() {
@Override @Override
protected ByteBuffer[] initialValue() throws Exception { protected ByteBuffer[] initialValue() throws Exception {
// Use 1024 as this is the IOV_MAX value on linux. If you sue a bigger one the JDK may do some array
// copy which we should not trigger.
//
// See 'man 2 writev' for more informations.
return new ByteBuffer[1024]; return new ByteBuffer[1024];
} }
}; };
@ -359,8 +355,8 @@ public final class ChannelOutboundBuffer {
int count = buf.nioBufferCount(); int count = buf.nioBufferCount();
int neededSpace = nioBufferCount + count; int neededSpace = nioBufferCount + count;
if (neededSpace > nioBuffers.length) { if (neededSpace > nioBuffers.length) {
// We have not enough space left in the array to add the ByteBuffers so break here. nioBuffers = expandNioBufferArray(nioBuffers, neededSpace, nioBufferCount);
break; NIO_BUFFERS.set(threadLocalMap, nioBuffers);
} }
if (count == 1) { if (count == 1) {
ByteBuffer nioBuf = buf.internalNioBuffer(readerIndex, readableBytes); ByteBuffer nioBuf = buf.internalNioBuffer(readerIndex, readableBytes);
@ -389,6 +385,25 @@ public final class ChannelOutboundBuffer {
return nioBufferCount; return nioBufferCount;
} }
private static ByteBuffer[] expandNioBufferArray(ByteBuffer[] array, int neededSpace, int size) {
int newCapacity = array.length;
do {
// double capacity until it is big enough
// See https://github.com/netty/netty/issues/1890
newCapacity <<= 1;
if (newCapacity < 0) {
throw new IllegalStateException();
}
} while (neededSpace > newCapacity);
ByteBuffer[] newArray = new ByteBuffer[newCapacity];
System.arraycopy(array, 0, newArray, 0, size);
return newArray;
}
/** /**
* Returns the number of {@link ByteBuffer} that can be written out of the {@link ByteBuffer} array that was * Returns the number of {@link ByteBuffer} that can be written out of the {@link ByteBuffer} array that was
* obtained via {@link #nioBuffers()}. This method <strong>MUST</strong> be called after {@link #nioBuffers()} * obtained via {@link #nioBuffers()}. This method <strong>MUST</strong> be called after {@link #nioBuffers()}