Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Rename to LocalCache

Browse Source
This commit is contained in:
TheMode 2021-08-13 01:13:58 +02:00
parent 78126fad6c
commit 322572c96d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java
View File

@ -33,7 +33,7 @@ public class ChunkDataPacket implements ServerPacket {
public Map<Integer, Block> entries = new HashMap<>(); public Map<Integer, Block> entries = new HashMap<>();
private static final byte CHUNK_SECTION_COUNT = 16; private static final byte CHUNK_SECTION_COUNT = 16;
private static final PacketUtils.Cache BLOCK_CACHE = PacketUtils.Cache.get("chunk-block-cache", 262_144); private static final PacketUtils.LocalCache BLOCK_CACHE = PacketUtils.LocalCache.get("chunk-block-cache", 262_144);
/** /**
* Heightmaps NBT, as read from raw packet data. * Heightmaps NBT, as read from raw packet data.
@ -49,7 +49,7 @@ public class ChunkDataPacket implements ServerPacket {
writer.writeInt(chunkX); writer.writeInt(chunkX);
writer.writeInt(chunkZ); writer.writeInt(chunkZ);
ByteBuffer blocks = BLOCK_CACHE.retrieveLocal(); ByteBuffer blocks = BLOCK_CACHE.get();
Int2LongRBTreeMap maskMap = new Int2LongRBTreeMap(); Int2LongRBTreeMap maskMap = new Int2LongRBTreeMap();

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

@ -32,8 +32,8 @@ 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> COMPRESSOR = ThreadLocal.withInitial(Deflater::new); private static final ThreadLocal<Deflater> COMPRESSOR = ThreadLocal.withInitial(Deflater::new);
private static final Cache PACKET_BUFFER = Cache.get("packet-buffer", Server.SOCKET_BUFFER_SIZE); private static final LocalCache PACKET_BUFFER = LocalCache.get("packet-buffer", Server.SOCKET_BUFFER_SIZE);
private static final Cache COMPRESSION_CACHE = Cache.get("compression-buffer", Server.SOCKET_BUFFER_SIZE); private static final LocalCache COMPRESSION_CACHE = LocalCache.get("compression-buffer", Server.SOCKET_BUFFER_SIZE);
private PacketUtils() { private PacketUtils() {
} }
@ -154,7 +154,7 @@ public final class PacketUtils {
// Packet large enough, compress // Packet large enough, compress
final int limitCache = buffer.limit(); final int limitCache = buffer.limit();
buffer.position(contentStart).limit(contentStart + packetSize); buffer.position(contentStart).limit(contentStart + packetSize);
var uncompressedCopy = COMPRESSION_CACHE.retrieveLocal().put(buffer).flip(); var uncompressedCopy = COMPRESSION_CACHE.get().put(buffer).flip();
buffer.position(contentStart).limit(limitCache); buffer.position(contentStart).limit(limitCache);
var deflater = COMPRESSOR.get(); var deflater = COMPRESSOR.get();
@ -190,11 +190,11 @@ public final class PacketUtils {
} }
public static ByteBuffer createFramedPacket(@NotNull ServerPacket packet) { public static ByteBuffer createFramedPacket(@NotNull ServerPacket packet) {
return createFramedPacket(PACKET_BUFFER.retrieveLocal(), packet); return createFramedPacket(PACKET_BUFFER.get(), packet);
} }
public static ByteBuffer createFramedPacket(@NotNull ServerPacket packet, boolean compression) { public static ByteBuffer createFramedPacket(@NotNull ServerPacket packet, boolean compression) {
return createFramedPacket(PACKET_BUFFER.retrieveLocal(), packet, compression); return createFramedPacket(PACKET_BUFFER.get(), packet, compression);
} }
public static ByteBuffer allocateTrimmedPacket(@NotNull ServerPacket packet) { public static ByteBuffer allocateTrimmedPacket(@NotNull ServerPacket packet) {
@ -203,26 +203,26 @@ public final class PacketUtils {
} }
@ApiStatus.Internal @ApiStatus.Internal
public static final class Cache { public static final class LocalCache {
private static final Map<String, Cache> CACHES = new ConcurrentHashMap<>(); private static final Map<String, LocalCache> CACHES = new ConcurrentHashMap<>();
private final String name; private final String name;
private final ThreadLocal<ByteBuffer> cache; private final ThreadLocal<ByteBuffer> cache;
private Cache(String name, int size) { private LocalCache(String name, int size) {
this.name = name; this.name = name;
this.cache = ThreadLocal.withInitial(() -> ByteBuffer.allocateDirect(size)); this.cache = ThreadLocal.withInitial(() -> ByteBuffer.allocateDirect(size));
} }
public static Cache get(String name, int size) { public static LocalCache get(String name, int size) {
return CACHES.computeIfAbsent(name, s -> new Cache(name, size)); return CACHES.computeIfAbsent(name, s -> new LocalCache(name, size));
} }
public String name() { public String name() {
return name; return name;
} }
public ByteBuffer retrieveLocal() { public ByteBuffer get() {
return cache.get().clear(); return cache.get().clear();
} }
} }