Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-27 06:03:01 +02:00
Code Issues Projects Releases Wiki Activity

Use ThreadLocal for deflater instead of dirty hack

Browse Source
This commit is contained in:
themode 2021-03-05 23:57:28 +01:00
parent 469a4a32f7
commit 999a815eba
2 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/network/netty/codec/PacketCompressor.java
View File

@ -36,7 +36,7 @@ public class PacketCompressor extends ByteToMessageCodec<ByteBuf> {
private final byte[] buffer = new byte[8192];
private final Deflater deflater = new Deflater(3);
private final Deflater deflater = new Deflater();
private final Inflater inflater = new Inflater();
public PacketCompressor(int threshold) {
@ -45,7 +45,7 @@ public class PacketCompressor extends ByteToMessageCodec<ByteBuf> {
@Override
protected void encode(ChannelHandlerContext ctx, ByteBuf from, ByteBuf to) {
PacketUtils.compressBuffer(deflater, buffer, from, to, false);
PacketUtils.compressBuffer(deflater, buffer, from, to);
}
@Override

51
src/main/java/net/minestom/server/utils/PacketUtils.java
View File

@ -16,9 +16,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ThreadLocalRandom;
import java.util.zip.Deflater;
/**
@ -28,15 +25,7 @@ import java.util.zip.Deflater;
public final class PacketUtils {
private static final PacketListenerManager PACKET_LISTENER_MANAGER = MinecraftServer.getPacketListenerManager();
private static final int DEFLATER_COUNT = 10;
private static final List<Deflater> DEFLATERS = new CopyOnWriteArrayList<>();
static {
for (int i = 0; i < DEFLATER_COUNT; i++) {
DEFLATERS.add(new Deflater(3));
}
}
private static final ThreadLocal<Deflater> DEFLATER = ThreadLocal.withInitial(Deflater::new);
private PacketUtils() {
@ -209,8 +198,7 @@ public final class PacketUtils {
* @param compressionTarget the buffer which will receive the compressed version of {@code packetBuffer}
*/
public static void compressBuffer(@NotNull Deflater deflater, @Nullable byte[] buffer,
@NotNull ByteBuf packetBuffer, @NotNull ByteBuf compressionTarget,
boolean synchronization) {
@NotNull ByteBuf packetBuffer, @NotNull ByteBuf compressionTarget) {
final int packetLength = packetBuffer.readableBytes();
if (packetLength < MinecraftServer.getCompressionThreshold()) {
@ -220,30 +208,18 @@ public final class PacketUtils {
Utils.writeVarIntBuf(compressionTarget, packetLength);
final Runnable compressor = () -> {
// Allocate buffer if not already
byte[] output = buffer != null ? buffer : new byte[8192];
// Allocate buffer if not already
byte[] output = buffer != null ? buffer : new byte[8192];
deflater.setInput(packetBuffer.nioBuffer());
deflater.finish();
deflater.setInput(packetBuffer.nioBuffer());
deflater.finish();
while (!deflater.finished()) {
final int length = deflater.deflate(output);
compressionTarget.writeBytes(output, 0, length);
}
deflater.reset();
;
};
// Synchronize only if asked
if (synchronization) {
synchronized (deflater) {
compressor.run();
}
} else {
compressor.run();
while (!deflater.finished()) {
final int length = deflater.deflate(output);
compressionTarget.writeBytes(output, 0, length);
}
deflater.reset();
}
}
@ -265,9 +241,8 @@ public final class PacketUtils {
ByteBuf compressedBuf = directBuffer ? BufUtils.getBuffer(true) : Unpooled.buffer();
ByteBuf framedBuf = directBuffer ? BufUtils.getBuffer(true) : Unpooled.buffer();
// Get a random deflater
final Deflater deflater = DEFLATERS.get(ThreadLocalRandom.current().nextInt(DEFLATER_COUNT));
compressBuffer(deflater, null, packetBuf, compressedBuf, true);
final Deflater deflater = DEFLATER.get();
compressBuffer(deflater, null, packetBuf, compressedBuf);
packetBuf.release();