From 7e2ae8758c15a771edf77aa9708cb76bb0e13574 Mon Sep 17 00:00:00 2001
From: Trustin Lee <t@motd.kr>
Date: Sun, 7 Dec 2014 12:06:11 +0900
Subject: [PATCH] Fire channelRead() event immediately in OIO message channels

Related: #3189

Motivation:

OIO transport implementations block for at most 1 second to wait for
additional messages (or accepted connections).

However, because AbstractOioMessageChannel defers the channelRead()
events for the messages read so far until there's nothing to read up to
maxMessagesPerRead, any read operation will be followed by a 1-second
delay.

Modifications:

Fire channelRead() events as soon as doRead() returns so that there is
no 1 second delay between the actual read and the channelRead() event.

Result:

No more weird 1-second delay
---
 .../oio/AbstractOioMessageChannel.java        | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java b/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java
index 3e7033da8f..f10ee86611 100644
--- a/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java
+++ b/transport/src/main/java/io/netty/channel/oio/AbstractOioMessageChannel.java
@@ -43,8 +43,10 @@ public abstract class AbstractOioMessageChannel extends AbstractOioChannel {
 
         Throwable exception = null;
         int localRead = 0;
+        int totalRead = 0;
         try {
             for (;;) {
+                // Perform a read.
                 localRead = doReadMessages(readBuf);
                 if (localRead == 0) {
                     break;
@@ -54,7 +56,17 @@ public abstract class AbstractOioMessageChannel extends AbstractOioChannel {
                     break;
                 }
 
-                if (readBuf.size() >= maxMessagesPerRead || !config.isAutoRead()) {
+                // Notify with the received messages and clear the buffer.
+                int size = readBuf.size();
+                for (int i = 0; i < size; i ++) {
+                    pipeline.fireChannelRead(readBuf.get(i));
+                }
+                readBuf.clear();
+
+                // Do not read beyond maxMessagesPerRead.
+                // Do not continue reading if autoRead has been turned off.
+                totalRead += localRead;
+                if (totalRead >= maxMessagesPerRead || !config.isAutoRead()) {
                     break;
                 }
             }
@@ -62,11 +74,6 @@ public abstract class AbstractOioMessageChannel extends AbstractOioChannel {
             exception = t;
         }
 
-        int size = readBuf.size();
-        for (int i = 0; i < size; i ++) {
-            pipeline.fireChannelRead(readBuf.get(i));
-        }
-        readBuf.clear();
         pipeline.fireChannelReadComplete();
 
         if (exception != null) {