From 93312264062b10909ef09613b171ba323cb2c1ff Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Thu, 5 Sep 2013 09:22:13 +0200
Subject: [PATCH] Split up the nioBuffers() method to allow for inline. Related
 to #1812

This move less common method patterns to extra methods and so make the nioBuffers() method with most common pattern (backed by one ByteBuffer) small enough for inlining.
---
 .../netty/channel/ChannelOutboundBuffer.java  | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java b/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
index 2462906e99..63804dfe1a 100644
--- a/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
+++ b/transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
@@ -315,12 +315,11 @@ public final class ChannelOutboundBuffer {
      * </p>
      */
     public ByteBuffer[] nioBuffers() {
-        ByteBuffer[] nioBuffers = this.nioBuffers;
         long nioBufferSize = 0;
         int nioBufferCount = 0;
-
         final int mask = buffer.length - 1;
         final ByteBufAllocator alloc = channel.alloc();
+        ByteBuffer[] nioBuffers = this.nioBuffers;
         Object m;
         int i = flushed;
         while (i != unflushed && (m = buffer[i].msg) != null) {
@@ -331,53 +330,58 @@ public final class ChannelOutboundBuffer {
             }
 
             ByteBuf buf = (ByteBuf) m;
-
             final int readerIndex = buf.readerIndex();
             final int readableBytes = buf.writerIndex() - readerIndex;
 
             if (readableBytes > 0) {
                 nioBufferSize += readableBytes;
-
+                int count = buf.nioBufferCount();
+                if (nioBufferCount + count > nioBuffers.length) {
+                    this.nioBuffers = nioBuffers = doubleNioBufferArray(nioBuffers, nioBufferCount);
+                }
                 if (buf.isDirect() || !alloc.isDirectBufferPooled()) {
-                    int count = buf.nioBufferCount();
-                    if (count == 1) {
-                        if (nioBufferCount == nioBuffers.length) {
-                            this.nioBuffers = nioBuffers = doubleNioBufferArray(nioBuffers, nioBufferCount);
-                        }
+                    if (buf.nioBufferCount() == 1) {
                         nioBuffers[nioBufferCount ++] = buf.internalNioBuffer(readerIndex, readableBytes);
                     } else {
-                        ByteBuffer[] nioBufs = buf.nioBuffers();
-                        if (nioBufferCount + nioBufs.length > nioBuffers.length) {
-                            this.nioBuffers = nioBuffers = doubleNioBufferArray(nioBuffers, nioBufferCount);
-                        }
-                        for (ByteBuffer nioBuf: nioBufs) {
-                            if (nioBuf == null) {
-                                break;
-                            }
-                            nioBuffers[nioBufferCount ++] = nioBuf;
-                        }
+                        nioBufferCount = fillBufferArray(buf, nioBuffers, nioBufferCount);
                     }
                 } else {
-                    ByteBuf directBuf = alloc.directBuffer(readableBytes);
-                    directBuf.writeBytes(buf, readerIndex, readableBytes);
-                    buf.release();
-                    buffer[i].msg = directBuf;
-                    if (nioBufferCount == nioBuffers.length) {
-                        nioBuffers = doubleNioBufferArray(nioBuffers, nioBufferCount);
-                    }
-                    nioBuffers[nioBufferCount ++] = directBuf.internalNioBuffer(0, readableBytes);
+                    nioBufferCount = fillBufferArrayNonDirect(buffer[i], buf, readerIndex,
+                            readableBytes, alloc, nioBuffers, nioBufferCount);
                 }
             }
-
             i = i + 1 & mask;
         }
-
         this.nioBufferCount = nioBufferCount;
         this.nioBufferSize = nioBufferSize;
 
         return nioBuffers;
     }
 
+    private static int fillBufferArray(ByteBuf buf, ByteBuffer[] nioBuffers, int nioBufferCount) {
+        ByteBuffer[] nioBufs = buf.nioBuffers();
+        for (ByteBuffer nioBuf: nioBufs) {
+            if (nioBuf == null) {
+                break;
+            }
+            nioBuffers[nioBufferCount ++] = nioBuf;
+        }
+        return nioBufferCount;
+    }
+
+    private static int fillBufferArrayNonDirect(Entry entry, ByteBuf buf, int readerIndex, int readableBytes,
+                                      ByteBufAllocator alloc, ByteBuffer[] nioBuffers, int nioBufferCount) {
+        ByteBuf directBuf = alloc.directBuffer(readableBytes);
+        directBuf.writeBytes(buf, readerIndex, readableBytes);
+        buf.release();
+        entry.msg = directBuf;
+        if (nioBufferCount == nioBuffers.length) {
+            nioBuffers = doubleNioBufferArray(nioBuffers, nioBufferCount);
+        }
+        nioBuffers[nioBufferCount ++] = directBuf.internalNioBuffer(0, readableBytes);
+        return nioBufferCount;
+    }
+
     private static ByteBuffer[] doubleNioBufferArray(ByteBuffer[] array, int size) {
         int newCapacity = array.length << 1;
         if (newCapacity < 0) {