Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #7757] Use CompositeByteBuf to prevent memory copy. #7694

Merged
merged 6 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
package org.apache.rocketmq.remoting.netty;

import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.CompositeByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.FileRegion;
import io.netty.handler.codec.MessageToByteEncoder;
Expand Down Expand Up @@ -51,9 +54,12 @@ protected void encode(ChannelHandlerContext ctx, FileRegion msg, final ByteBuf o
WritableByteChannel writableByteChannel = new WritableByteChannel() {
@Override
public int write(ByteBuffer src) {
int prev = out.writerIndex();
out.writeBytes(src);
return out.writerIndex() - prev;
// To prevent mem_copy.
CompositeByteBuf b = (CompositeByteBuf) out;
// Have to increase writerIndex manually.
ByteBuf unpooled = Unpooled.wrappedBuffer(src);
b.addComponent(true, unpooled);
return unpooled.readableBytes();
}

@Override
Expand All @@ -76,4 +82,10 @@ public void close() throws IOException {
msg.transferTo(writableByteChannel, transferred);
}
}
}

@Override
protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, FileRegion msg, boolean preferDirect) throws Exception {
ByteBufAllocator allocator = ctx.alloc();
return preferDirect ? allocator.compositeDirectBuffer() : allocator.compositeHeapBuffer();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,22 @@
package org.apache.rocketmq.remoting.netty;

import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.CompositeByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.DefaultFileRegion;
import io.netty.channel.FileRegion;
import io.netty.channel.embedded.EmbeddedChannel;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Random;
import java.util.UUID;
import org.junit.Assert;
import org.junit.Test;
import sun.nio.ch.DirectBuffer;

public class FileRegionEncoderTest {

Expand Down Expand Up @@ -77,4 +82,51 @@ private static void write(File file, byte[] data) throws IOException {
}
}
}

@Test
public void testUnpooledByteBuffer() {
ByteBuffer buffer = ByteBuffer.allocateDirect(128);
try {
int value = Integer.MAX_VALUE;
for (int i = 0; i < 128 / 4; i++) {
buffer.putInt(value);
}
buffer.flip();
ByteBuf buf1 = Unpooled.wrappedBuffer(buffer);
Assert.assertEquals(buf1.readableBytes(), 128);
Assert.assertEquals(buf1.readerIndex(), 0);
Assert.assertEquals(buf1.writerIndex(), 128);

for (int i = 0; i < 128 / 4; i++) {
Assert.assertEquals(buf1.readInt(), value);
}
} finally {
((DirectBuffer) buffer).cleaner().clean();
}
}

@Test
public void testCompositeByteBuffer() {
ByteBuffer buffer = ByteBuffer.allocateDirect(128);
try {
int value = Integer.MAX_VALUE;
for (int i = 0; i < 128 / 4; i++) {
buffer.putInt(value);
}
buffer.flip();
ByteBuf buf = Unpooled.wrappedBuffer(buffer);
CompositeByteBuf cbuf = ByteBufAllocator.DEFAULT.compositeBuffer();
cbuf.addComponent(true, buf);
Assert.assertEquals(cbuf.readerIndex(), 0);
Assert.assertEquals(cbuf.writerIndex(), 128);
Assert.assertEquals(cbuf.readableBytes(), 128);
Assert.assertEquals(cbuf.refCnt(), 1);
Assert.assertEquals(buf.refCnt(), 1);
cbuf.release();
Assert.assertEquals(cbuf.refCnt(), 0);
Assert.assertEquals(buf.refCnt(), 0);
} finally {
((DirectBuffer) buffer).cleaner().clean();
}
}
}
Loading