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

Change HTTP/2 tests to retain rather than copy ByteBufs

Browse Source 
Motivation:

The current build is showing potential leaks in the HTTP/2 tests that
use Http2TestUtil.FrameCountDown, which copies the buffers when it
receives them from the decoder. The leak detecor sees this copy as the
source of a leak. It would be better all around to just retain, rather
than copying the buffer. This should help to lower the overall memory
footprint of the tests as well as potentially getting rid of the
reported "leaks".

Modifications:

Modified Http2TestUtil to use ByteBuf.retain() everywhere that was
previously calling ByteBuf.copy().

Result:

Smaller memory footprint for tests and hopefully getting rid of reported
leaks.
This commit is contained in:
nmittler 2014-09-19 13:58:00 -07:00
parent 8bc7deeb87
commit 764e6c3bb7
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
codec-http2/src/test/java/io/netty/handler/codec/http2/Http2TestUtil.java
View File

@ -85,26 +85,27 @@ final class Http2TestUtil {
} }
static class FrameAdapter extends ByteToMessageDecoder { static class FrameAdapter extends ByteToMessageDecoder {
private final boolean copyBufs; private final boolean retainBufs;
private final Http2Connection connection; private final Http2Connection connection;
private final Http2FrameListener listener; private final Http2FrameListener listener;
private final DefaultHttp2FrameReader reader; private final DefaultHttp2FrameReader reader;
private CountDownLatch latch; private CountDownLatch latch;
FrameAdapter(Http2FrameListener listener, CountDownLatch latch, boolean copyBufs) { FrameAdapter(Http2FrameListener listener, CountDownLatch latch, boolean retainBufs) {
this(null, listener, latch, copyBufs); this(null, listener, latch, retainBufs);
} }
FrameAdapter(Http2Connection connection, Http2FrameListener listener, CountDownLatch latch, boolean copyBufs) { FrameAdapter(Http2Connection connection, Http2FrameListener listener, CountDownLatch latch,
this(connection, new DefaultHttp2FrameReader(), listener, latch, copyBufs); boolean retainBufs) {
this(connection, new DefaultHttp2FrameReader(), listener, latch, retainBufs);
} }
FrameAdapter(Http2Connection connection, DefaultHttp2FrameReader reader, Http2FrameListener listener, FrameAdapter(Http2Connection connection, DefaultHttp2FrameReader reader, Http2FrameListener listener,
CountDownLatch latch, boolean copyBufs) { CountDownLatch latch, boolean retainBufs) {
this.connection = connection; this.connection = connection;
this.listener = listener; this.listener = listener;
this.reader = reader; this.reader = reader;
this.copyBufs = copyBufs; this.retainBufs = retainBufs;
latch(latch); latch(latch);
} }
@ -149,7 +150,7 @@ final class Http2TestUtil {
public void onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, public void onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding,
boolean endOfStream) throws Http2Exception { boolean endOfStream) throws Http2Exception {
Http2Stream stream = getOrCreateStream(streamId, endOfStream); Http2Stream stream = getOrCreateStream(streamId, endOfStream);
listener.onDataRead(ctx, streamId, copyBufs ? data.copy() : data, padding, endOfStream); listener.onDataRead(ctx, streamId, retainBufs ? data.retain() : data, padding, endOfStream);
if (endOfStream) { if (endOfStream) {
closeStream(stream, true); closeStream(stream, true);
} }
@ -217,13 +218,13 @@ final class Http2TestUtil {
@Override @Override
public void onPingRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception { public void onPingRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception {
listener.onPingRead(ctx, copyBufs ? data.copy() : data); listener.onPingRead(ctx, retainBufs ? data.retain() : data);
latch.countDown(); latch.countDown();
} }
@Override @Override
public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception { public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception {
listener.onPingAckRead(ctx, copyBufs ? data.copy() : data); listener.onPingAckRead(ctx, retainBufs ? data.retain() : data);
latch.countDown(); latch.countDown();
} }
@ -238,7 +239,7 @@ final class Http2TestUtil {
@Override @Override
public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData) public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
throws Http2Exception { throws Http2Exception {
listener.onGoAwayRead(ctx, lastStreamId, errorCode, copyBufs ? debugData.copy() : debugData); listener.onGoAwayRead(ctx, lastStreamId, errorCode, retainBufs ? debugData.retain() : debugData);
latch.countDown(); latch.countDown();
} }
@ -290,7 +291,7 @@ final class Http2TestUtil {
@Override @Override
public void onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream) public void onDataRead(ChannelHandlerContext ctx, int streamId, ByteBuf data, int padding, boolean endOfStream)
throws Http2Exception { throws Http2Exception {
listener.onDataRead(ctx, streamId, data.copy(), padding, endOfStream); listener.onDataRead(ctx, streamId, data.retain(), padding, endOfStream);
messageLatch.countDown(); messageLatch.countDown();
if (dataLatch != null) { if (dataLatch != null) {
for (int i = 0; i < data.readableBytes(); ++i) { for (int i = 0; i < data.readableBytes(); ++i) {
@ -340,13 +341,13 @@ final class Http2TestUtil {
@Override @Override
public void onPingRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception { public void onPingRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception {
listener.onPingRead(ctx, data.copy()); listener.onPingRead(ctx, data.retain());
messageLatch.countDown(); messageLatch.countDown();
} }
@Override @Override
public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception { public void onPingAckRead(ChannelHandlerContext ctx, ByteBuf data) throws Http2Exception {
listener.onPingAckRead(ctx, data.copy()); listener.onPingAckRead(ctx, data.retain());
messageLatch.countDown(); messageLatch.countDown();
} }
@ -360,7 +361,7 @@ final class Http2TestUtil {
@Override @Override
public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData) public void onGoAwayRead(ChannelHandlerContext ctx, int lastStreamId, long errorCode, ByteBuf debugData)
throws Http2Exception { throws Http2Exception {
listener.onGoAwayRead(ctx, lastStreamId, errorCode, debugData.copy()); listener.onGoAwayRead(ctx, lastStreamId, errorCode, debugData.retain());
messageLatch.countDown(); messageLatch.countDown();
} }