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

Reverted the previous optimization because it might perform very bad as the number of components in the composite buffer increases

Browse Source
This commit is contained in:
Trustin Lee 2009-11-17 15:46:34 +00:00
parent 902ab48820
commit 8eeb72cbbf
5 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
View File

@ -179,12 +179,12 @@ public class DelimiterBasedFrameDecoder extends FrameDecoder {
} }
if (stripDelimiter) { if (stripDelimiter) {
frame = buffer.slice(buffer.readerIndex(), minFrameLength); frame = buffer.readBytes(minFrameLength);
buffer.skipBytes(minDelimLength);
} else { } else {
frame = buffer.slice(buffer.readerIndex(), minFrameLength + minDelimLength); frame = buffer.readBytes(minFrameLength + minDelimLength);
} }
buffer.skipBytes(minFrameLength + minDelimLength);
return frame; return frame;
} else { } else {
if (buffer.readableBytes() > maxFrameLength) { if (buffer.readableBytes() > maxFrameLength) {

4
src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java
View File

@ -63,9 +63,7 @@ public class FixedLengthFrameDecoder extends FrameDecoder {
if (buffer.readableBytes() < frameLength) { if (buffer.readableBytes() < frameLength) {
return null; return null;
} else { } else {
ChannelBuffer frame = buffer.slice(buffer.readerIndex(), frameLength); return buffer.readBytes(frameLength);
buffer.skipBytes(frameLength);
return frame;
} }
} }
} }

40
src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java
View File

@ -16,6 +16,7 @@
package org.jboss.netty.handler.codec.frame; package org.jboss.netty.handler.codec.frame;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.util.concurrent.atomic.AtomicReference;
import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.buffer.ChannelBuffers;
@ -180,8 +181,8 @@ import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
public abstract class FrameDecoder extends SimpleChannelUpstreamHandler { public abstract class FrameDecoder extends SimpleChannelUpstreamHandler {
private final boolean unfold; private final boolean unfold;
private ChannelBuffer cumulation = ChannelBuffers.EMPTY_BUFFER; private final AtomicReference<ChannelBuffer> cumulation =
private boolean cleanedUp; new AtomicReference<ChannelBuffer>();
protected FrameDecoder() { protected FrameDecoder() {
this(false); this(false);
@ -206,17 +207,16 @@ public abstract class FrameDecoder extends SimpleChannelUpstreamHandler {
return; return;
} }
ChannelBuffer cumulation = this.cumulation; ChannelBuffer cumulation = cumulation(ctx);
if (cumulation.readable()) { if (cumulation.readable()) {
cumulation = ChannelBuffers.wrappedBuffer(cumulation, input); cumulation.discardReadBytes();
} else { cumulation.writeBytes(input);
cumulation = input;
}
try {
callDecode(ctx, e.getChannel(), cumulation, e.getRemoteAddress()); callDecode(ctx, e.getChannel(), cumulation, e.getRemoteAddress());
} finally { } else {
this.cumulation = cumulation.slice(); callDecode(ctx, e.getChannel(), input, e.getRemoteAddress());
if (input.readable()) {
cumulation.writeBytes(input);
}
} }
} }
@ -321,12 +321,10 @@ public abstract class FrameDecoder extends SimpleChannelUpstreamHandler {
private void cleanup(ChannelHandlerContext ctx, ChannelStateEvent e) private void cleanup(ChannelHandlerContext ctx, ChannelStateEvent e)
throws Exception { throws Exception {
try { try {
if (cleanedUp) { ChannelBuffer cumulation = this.cumulation.getAndSet(null);
if (cumulation == null) {
return; return;
} }
cleanedUp = true;
ChannelBuffer cumulation = this.cumulation;
this.cumulation = ChannelBuffers.EMPTY_BUFFER;
if (cumulation.readable()) { if (cumulation.readable()) {
// Make sure all frames are read before notifying a closed channel. // Make sure all frames are read before notifying a closed channel.
@ -344,4 +342,16 @@ public abstract class FrameDecoder extends SimpleChannelUpstreamHandler {
ctx.sendUpstream(e); ctx.sendUpstream(e);
} }
} }
private ChannelBuffer cumulation(ChannelHandlerContext ctx) {
ChannelBuffer buf = cumulation.get();
if (buf == null) {
buf = ChannelBuffers.dynamicBuffer(
ctx.getChannel().getConfig().getBufferFactory());
if (!cumulation.compareAndSet(null, buf)) {
buf = cumulation.get();
}
}
return buf;
}
} }

8
src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
View File

@ -363,11 +363,7 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder {
"Adjusted frame length (" + frameLength + ") is less " + "Adjusted frame length (" + frameLength + ") is less " +
"than initialBytesToStrip: " + initialBytesToStrip); "than initialBytesToStrip: " + initialBytesToStrip);
} }
buffer.skipBytes(initialBytesToStrip);
ChannelBuffer frame = buffer.slice( return buffer.readBytes(frameLengthInt - initialBytesToStrip);
buffer.readerIndex() + initialBytesToStrip,
frameLengthInt - initialBytesToStrip);
buffer.skipBytes(frameLengthInt);
return frame;
} }
} }

6
src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
View File

@ -55,11 +55,7 @@ public class ProtobufVarint32FrameDecoder extends FrameDecoder {
break; break;
} }
// TODO Extract (ChannelBuffer.slice(int, int) + skipBytes(int)) return buffer.readBytes(messageSize);
// into a new method in ChannelBuffer
ChannelBuffer frame = buffer.slice(buffer.readerIndex(), messageSize);
buffer.skipBytes(messageSize);
return frame;
} }
} }