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

Make sure OP_WRITE is correctly cleared when using FileRegion and other NioTasks

Browse Source
This commit is contained in:
Norman Maurer 2013-04-04 08:38:58 +02:00
parent c03179c81c
commit 4505e7f1b3
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/src/main/java/io/netty/channel/nio/AbstractNioByteChannel.java
View File

@ -134,12 +134,6 @@ public abstract class AbstractNioByteChannel extends AbstractNioChannel {
@Override @Override
protected void doFlushByteBuffer(ByteBuf buf) throws Exception { protected void doFlushByteBuffer(ByteBuf buf) throws Exception {
if (!buf.isReadable()) {
// Reset reader/writerIndex to 0 if the buffer is empty.
buf.clear();
return;
}
for (int i = config().getWriteSpinCount() - 1; i >= 0; i --) { for (int i = config().getWriteSpinCount() - 1; i >= 0; i --) {
int localFlushedAmount = doWriteBytes(buf, i == 0); int localFlushedAmount = doWriteBytes(buf, i == 0);
if (localFlushedAmount > 0) { if (localFlushedAmount > 0) {

18
transport/src/main/java/io/netty/channel/nio/NioEventLoop.java
View File

@ -458,17 +458,15 @@ public final class NioEventLoop extends SingleThreadEventLoop {
} }
private static void processWritable(SelectionKey k, AbstractNioChannel ch) { private static void processWritable(SelectionKey k, AbstractNioChannel ch) {
if (ch.writableTasks.isEmpty()) { NioTask<SelectableChannel> task;
ch.unsafe().flushNow(); for (;;) {
} else { task = ch.writableTasks.poll();
NioTask<SelectableChannel> task; if (task == null) { break; }
for (;;) { processSelectedKey(ch.selectionKey(), task);
task = ch.writableTasks.poll();
if (task == null) { break; }
processSelectedKey(ch.selectionKey(), task);
}
k.interestOps(k.interestOps() | SelectionKey.OP_WRITE);
} }
// Call flushNow which will also take care of clear the OP_WRITE once there is nothing left to write
ch.unsafe().flushNow();
} }
private static void unregisterWritableTasks(AbstractNioChannel ch) { private static void unregisterWritableTasks(AbstractNioChannel ch) {