mirror of
https://github.com/Minestom/Minestom.git
synced 2024-09-27 14:13:24 +02:00
Use ThreadLocal for deflater instead of dirty hack
This commit is contained in:
parent
469a4a32f7
commit
999a815eba
@ -36,7 +36,7 @@ public class PacketCompressor extends ByteToMessageCodec<ByteBuf> {
|
|||||||
|
|
||||||
private final byte[] buffer = new byte[8192];
|
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();
|
private final Inflater inflater = new Inflater();
|
||||||
|
|
||||||
public PacketCompressor(int threshold) {
|
public PacketCompressor(int threshold) {
|
||||||
@ -45,7 +45,7 @@ public class PacketCompressor extends ByteToMessageCodec<ByteBuf> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void encode(ChannelHandlerContext ctx, ByteBuf from, ByteBuf to) {
|
protected void encode(ChannelHandlerContext ctx, ByteBuf from, ByteBuf to) {
|
||||||
PacketUtils.compressBuffer(deflater, buffer, from, to, false);
|
PacketUtils.compressBuffer(deflater, buffer, from, to);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -16,9 +16,6 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
|
||||||
import java.util.zip.Deflater;
|
import java.util.zip.Deflater;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,15 +25,7 @@ import java.util.zip.Deflater;
|
|||||||
public final class PacketUtils {
|
public final class PacketUtils {
|
||||||
|
|
||||||
private static final PacketListenerManager PACKET_LISTENER_MANAGER = MinecraftServer.getPacketListenerManager();
|
private static final PacketListenerManager PACKET_LISTENER_MANAGER = MinecraftServer.getPacketListenerManager();
|
||||||
|
private static final ThreadLocal<Deflater> DEFLATER = ThreadLocal.withInitial(Deflater::new);
|
||||||
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 PacketUtils() {
|
private PacketUtils() {
|
||||||
|
|
||||||
@ -209,8 +198,7 @@ public final class PacketUtils {
|
|||||||
* @param compressionTarget the buffer which will receive the compressed version of {@code packetBuffer}
|
* @param compressionTarget the buffer which will receive the compressed version of {@code packetBuffer}
|
||||||
*/
|
*/
|
||||||
public static void compressBuffer(@NotNull Deflater deflater, @Nullable byte[] buffer,
|
public static void compressBuffer(@NotNull Deflater deflater, @Nullable byte[] buffer,
|
||||||
@NotNull ByteBuf packetBuffer, @NotNull ByteBuf compressionTarget,
|
@NotNull ByteBuf packetBuffer, @NotNull ByteBuf compressionTarget) {
|
||||||
boolean synchronization) {
|
|
||||||
final int packetLength = packetBuffer.readableBytes();
|
final int packetLength = packetBuffer.readableBytes();
|
||||||
|
|
||||||
if (packetLength < MinecraftServer.getCompressionThreshold()) {
|
if (packetLength < MinecraftServer.getCompressionThreshold()) {
|
||||||
@ -220,30 +208,18 @@ public final class PacketUtils {
|
|||||||
|
|
||||||
Utils.writeVarIntBuf(compressionTarget, packetLength);
|
Utils.writeVarIntBuf(compressionTarget, packetLength);
|
||||||
|
|
||||||
final Runnable compressor = () -> {
|
// Allocate buffer if not already
|
||||||
// Allocate buffer if not already
|
byte[] output = buffer != null ? buffer : new byte[8192];
|
||||||
byte[] output = buffer != null ? buffer : new byte[8192];
|
|
||||||
|
|
||||||
deflater.setInput(packetBuffer.nioBuffer());
|
deflater.setInput(packetBuffer.nioBuffer());
|
||||||
deflater.finish();
|
deflater.finish();
|
||||||
|
|
||||||
while (!deflater.finished()) {
|
while (!deflater.finished()) {
|
||||||
final int length = deflater.deflate(output);
|
final int length = deflater.deflate(output);
|
||||||
compressionTarget.writeBytes(output, 0, length);
|
compressionTarget.writeBytes(output, 0, length);
|
||||||
}
|
|
||||||
|
|
||||||
deflater.reset();
|
|
||||||
;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Synchronize only if asked
|
|
||||||
if (synchronization) {
|
|
||||||
synchronized (deflater) {
|
|
||||||
compressor.run();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
compressor.run();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
deflater.reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -265,9 +241,8 @@ public final class PacketUtils {
|
|||||||
ByteBuf compressedBuf = directBuffer ? BufUtils.getBuffer(true) : Unpooled.buffer();
|
ByteBuf compressedBuf = directBuffer ? BufUtils.getBuffer(true) : Unpooled.buffer();
|
||||||
ByteBuf framedBuf = directBuffer ? BufUtils.getBuffer(true) : Unpooled.buffer();
|
ByteBuf framedBuf = directBuffer ? BufUtils.getBuffer(true) : Unpooled.buffer();
|
||||||
|
|
||||||
// Get a random deflater
|
final Deflater deflater = DEFLATER.get();
|
||||||
final Deflater deflater = DEFLATERS.get(ThreadLocalRandom.current().nextInt(DEFLATER_COUNT));
|
compressBuffer(deflater, null, packetBuf, compressedBuf);
|
||||||
compressBuffer(deflater, null, packetBuf, compressedBuf, true);
|
|
||||||
|
|
||||||
packetBuf.release();
|
packetBuf.release();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user