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

Correctly write single ByteBuf with memoryAddress

Browse Source 
Motivation:

While optimize gathering writes I introduced a bug when writing single ByteBuf that have a memoryAddress. This regression was introduced by 88bd6e7a93.

Modifications:

Correctly use the writerIndex as argument when call Native.writeAddress(...)

Result:

No more corruption while write single buffers.
This commit is contained in:
Norman Maurer 2014-07-25 17:27:22 +02:00
parent ca0571cc9d
commit 30295138fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollSocketChannel.java
View File

@ -116,8 +116,9 @@ public final class EpollSocketChannel extends AbstractEpollChannel implements So
if (buf.hasMemoryAddress()) { if (buf.hasMemoryAddress()) {
long memoryAddress = buf.memoryAddress(); long memoryAddress = buf.memoryAddress();
int readerIndex = buf.readerIndex(); int readerIndex = buf.readerIndex();
int writerIndex = buf.writerIndex();
for (;;) { for (;;) {
int localFlushedAmount = Native.writeAddress(fd, memoryAddress, readerIndex, readableBytes); int localFlushedAmount = Native.writeAddress(fd, memoryAddress, readerIndex, writerIndex);
if (localFlushedAmount > 0) { if (localFlushedAmount > 0) {
writtenBytes += localFlushedAmount; writtenBytes += localFlushedAmount;
if (writtenBytes == readableBytes) { if (writtenBytes == readableBytes) {
@ -125,7 +126,6 @@ public final class EpollSocketChannel extends AbstractEpollChannel implements So
break; break;
} }
readerIndex += localFlushedAmount; readerIndex += localFlushedAmount;
readableBytes -= localFlushedAmount;
} else { } else {
// Returned EAGAIN need to set EPOLLOUT // Returned EAGAIN need to set EPOLLOUT
setEpollOut(); setEpollOut();