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

Made sure composite buffer consolidation happens only once by converting CompositeChannelBuffer to an ordinary buffer

Browse Source
This commit is contained in:
Trustin Lee 2009-06-15 07:26:05 +00:00
parent 5fb8e8069b
commit 5ae0adbfaa
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
View File

@ -44,9 +44,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.ChannelBufferFactory;
import org.jboss.netty.buffer.CompositeChannelBuffer;
import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelException; import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.ChannelFuture; import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.DownstreamMessageEvent;
import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.ReceiveBufferSizePredictor; import org.jboss.netty.channel.ReceiveBufferSizePredictor;
import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLogger;
@ -408,6 +410,7 @@ class NioWorker implements Runnable {
break; break;
} }
evt = consolidateComposite(evt);
buf = (ChannelBuffer) evt.getMessage(); buf = (ChannelBuffer) evt.getMessage();
bufIdx = buf.readerIndex(); bufIdx = buf.readerIndex();
} else { } else {
@ -467,6 +470,20 @@ class NioWorker implements Runnable {
} }
} }
private static MessageEvent consolidateComposite(MessageEvent e) {
// Convert a composite buffer into a simple buffer to save memory
// bandwidth on full write buffer.
// This method should be eliminated once gathering write works.
Object m = e.getMessage();
if (m instanceof CompositeChannelBuffer) {
e = new DownstreamMessageEvent(
e.getChannel(), e.getFuture(),
((CompositeChannelBuffer) m).copy(),
e.getRemoteAddress());
}
return e;
}
private static void setOpWrite(NioSocketChannel channel) { private static void setOpWrite(NioSocketChannel channel) {
NioWorker worker = channel.worker; NioWorker worker = channel.worker;
Selector selector = worker.selector; Selector selector = worker.selector;