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

[#2168] Eliminate unnessary memory copy for heap buffers in JdkZlibEncoder

Browse Source 
* Also adjust tests so it test with direct and heap buffers
This commit is contained in:
Norman Maurer 2014-01-30 06:29:52 +01:00
parent b3e4122499
commit cd5103feb7
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java
View File

@ -196,8 +196,20 @@ public class JdkZlibEncoder extends ZlibEncoder {
return; return;
} }
byte[] inAry = new byte[uncompressed.readableBytes()]; int len = uncompressed.readableBytes();
uncompressed.readBytes(inAry); int offset;
byte[] inAry;
if (uncompressed.hasArray()) {
// if it is backed by an array we not need to to do a copy at all
inAry = uncompressed.array();
offset = uncompressed.arrayOffset() + uncompressed.readerIndex();
// skip all bytes as we will consume all of them
uncompressed.skipBytes(len);
} else {
inAry = new byte[len];
uncompressed.readBytes(inAry);
offset = 0;
}
int sizeEstimate = (int) Math.ceil(inAry.length * 1.001) + 12; int sizeEstimate = (int) Math.ceil(inAry.length * 1.001) + 12;
@ -222,7 +234,7 @@ public class JdkZlibEncoder extends ZlibEncoder {
crc.update(inAry); crc.update(inAry);
} }
deflater.setInput(inAry); deflater.setInput(inAry, offset, len);
while (!deflater.needsInput()) { while (!deflater.needsInput()) {
deflate(out); deflate(out);
} }

15
codec/src/test/java/io/netty/handler/codec/compression/ZlibTest.java
View File

@ -58,8 +58,7 @@ public abstract class ZlibTest {
buf.release(); buf.release();
} }
private void testCompress0(ZlibWrapper encoderWrapper, ZlibWrapper decoderWrapper, byte[] bytes) throws Exception { private void testCompress0(ZlibWrapper encoderWrapper, ZlibWrapper decoderWrapper, ByteBuf data) throws Exception {
ByteBuf data = Unpooled.wrappedBuffer(bytes);
EmbeddedChannel chEncoder = new EmbeddedChannel(createEncoder(encoderWrapper)); EmbeddedChannel chEncoder = new EmbeddedChannel(createEncoder(encoderWrapper));
chEncoder.writeOutbound(data.copy()); chEncoder.writeOutbound(data.copy());
@ -74,7 +73,7 @@ public abstract class ZlibTest {
chDecoderZlib.writeInbound(deflatedData); chDecoderZlib.writeInbound(deflatedData);
} }
byte[] decompressed = new byte[bytes.length]; byte[] decompressed = new byte[data.readableBytes()];
int offset = 0; int offset = 0;
for (;;) { for (;;) {
ByteBuf buf = chDecoderZlib.readInbound(); ByteBuf buf = chDecoderZlib.readInbound();
@ -89,7 +88,7 @@ public abstract class ZlibTest {
break; break;
} }
} }
assertArrayEquals(bytes, decompressed); assertEquals(data, Unpooled.wrappedBuffer(decompressed));
assertNull(chDecoderZlib.readInbound()); assertNull(chDecoderZlib.readInbound());
// Closing an encoder channel will generate a footer. // Closing an encoder channel will generate a footer.
@ -137,11 +136,15 @@ public abstract class ZlibTest {
} }
private void testCompressSmall(ZlibWrapper encoderWrapper, ZlibWrapper decoderWrapper) throws Exception { private void testCompressSmall(ZlibWrapper encoderWrapper, ZlibWrapper decoderWrapper) throws Exception {
testCompress0(encoderWrapper, decoderWrapper, BYTES_SMALL); testCompress0(encoderWrapper, decoderWrapper, Unpooled.wrappedBuffer(BYTES_SMALL));
testCompress0(encoderWrapper, decoderWrapper,
Unpooled.directBuffer(BYTES_SMALL.length).writeBytes(BYTES_SMALL));
} }
private void testCompressLarge(ZlibWrapper encoderWrapper, ZlibWrapper decoderWrapper) throws Exception { private void testCompressLarge(ZlibWrapper encoderWrapper, ZlibWrapper decoderWrapper) throws Exception {
testCompress0(encoderWrapper, decoderWrapper, BYTES_LARGE); testCompress0(encoderWrapper, decoderWrapper, Unpooled.wrappedBuffer(BYTES_LARGE));
testCompress0(encoderWrapper, decoderWrapper,
Unpooled.directBuffer(BYTES_LARGE.length).writeBytes(BYTES_LARGE));
} }
@Test @Test