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

Make the cumulation usage more efficient in terms of memroy usage

Browse Source
This commit is contained in:
norman 2012-04-23 10:25:05 +02:00
parent 172f24cfa8
commit 33715ede50
2 changed files with 74 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@ import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler; import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
/** /**
* Decodes the received {@link ChannelBuffer}s into a meaningful frame object. * Decodes the received {@link ChannelBuffer}s into a meaningful frame object.
@ -211,15 +210,45 @@ public abstract class FrameDecoder extends SimpleChannelUpstreamHandler {
(this.cumulation = newCumulationBuffer(ctx, input.readableBytes())).writeBytes(input); (this.cumulation = newCumulationBuffer(ctx, input.readableBytes())).writeBytes(input);
} }
} else { } else {
ChannelBuffer cumulation = this.cumulation;
assert cumulation.readable(); assert cumulation.readable();
if (cumulation.writableBytes() < input.readableBytes()) { boolean fit = false;
cumulation.discardReadBytes();
int readable = input.readableBytes();
int writable = cumulation.writableBytes();
int w = readable - writable;
if (w < 0) {
int readerIndex = cumulation.readerIndex();
if (w + readerIndex >= 0) {
// the input will fit if we discard all read bytes, so do it
cumulation.discardReadBytes();
fit = true;
}
} else {
// ok the input fit into the cumulation buffer
fit = true;
} }
cumulation.writeBytes(input);
callDecode(ctx, e.getChannel(), cumulation, e.getRemoteAddress()); ChannelBuffer buf;
if (!cumulation.readable()) { if (fit) {
// the input fit in the cumulation buffer so copy it over
buf = this.cumulation;
buf.writeBytes(input);
} else {
// wrap the cumulation and input
buf = ChannelBuffers.wrappedBuffer(cumulation, input);
this.cumulation = buf;
}
callDecode(ctx, e.getChannel(), buf, e.getRemoteAddress());
if (!buf.readable()) {
// nothing readable left so reset the state
this.cumulation = null; this.cumulation = null;
} else {
// create a new buffer and copy the readable buffer into it
this.cumulation = newCumulationBuffer(ctx, buf.readableBytes());
this.cumulation.writeBytes(buf);
} }
} }
} }

44
src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
View File

@ -474,16 +474,48 @@ public abstract class ReplayingDecoder<T extends Enum<T>>
replayable = ReplayingDecoderBuffer.EMPTY_BUFFER; replayable = ReplayingDecoderBuffer.EMPTY_BUFFER;
} }
} else { } else {
ChannelBuffer cumulation = this.cumulation;
assert cumulation.readable(); assert cumulation.readable();
if (cumulation.writableBytes() < input.readableBytes()) { boolean fit = false;
cumulation.discardReadBytes();
int readable = input.readableBytes();
int writable = cumulation.writableBytes();
int w = readable - writable;
if (w < 0) {
int readerIndex = cumulation.readerIndex();
if (w + readerIndex >= 0) {
// the input will fit if we discard all read bytes, so do it
cumulation.discardReadBytes();
fit = true;
}
} else {
// ok the input fit into the cumulation buffer
fit = true;
} }
cumulation.writeBytes(input);
callDecode(ctx, e.getChannel(), cumulation, replayable, e.getRemoteAddress()); ChannelBuffer buf;
if (!cumulation.readable()) { if (fit) {
// the input fit in the cumulation buffer so copy it over
buf = this.cumulation;
buf.writeBytes(input);
} else {
// wrap the cumulation and input
buf = ChannelBuffers.wrappedBuffer(cumulation, input);
this.cumulation = buf;
replayable = new ReplayingDecoderBuffer(cumulation);
}
callDecode(ctx, e.getChannel(), buf, replayable, e.getRemoteAddress());
if (!buf.readable()) {
// nothing readable left so reset the state
this.cumulation = null; this.cumulation = null;
replayable = ReplayingDecoderBuffer.EMPTY_BUFFER; replayable = ReplayingDecoderBuffer.EMPTY_BUFFER;
} else {
// create a new buffer and copy the readable buffer into it
this.cumulation = newCumulationBuffer(ctx, buf.readableBytes());
this.cumulation.writeBytes(buf);
replayable = new ReplayingDecoderBuffer(this.cumulation);
} }
} }
} }