Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 14:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into viewable-broadcast

Browse Source 
# Conflicts:
#	src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
This commit is contained in:
TheMode 2021-09-04 02:22:52 +02:00
commit 2c1e3e4323
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/minestom/server/network/player/PlayerSocketConnection.java
View File

@ -27,6 +27,7 @@ import javax.crypto.Cipher;
import javax.crypto.SecretKey; import javax.crypto.SecretKey;
import javax.crypto.ShortBufferException; import javax.crypto.ShortBufferException;
import java.io.IOException; import java.io.IOException;
import java.lang.ref.SoftReference;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.nio.BufferUnderflowException; import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -44,7 +45,7 @@ import java.util.zip.DataFormatException;
@ApiStatus.Internal @ApiStatus.Internal
public class PlayerSocketConnection extends PlayerConnection { public class PlayerSocketConnection extends PlayerConnection {
private final static Logger LOGGER = LoggerFactory.getLogger(PlayerSocketConnection.class); private final static Logger LOGGER = LoggerFactory.getLogger(PlayerSocketConnection.class);
private final static Queue<BinaryBuffer> POOLED_BUFFERS = new ConcurrentLinkedQueue<>(); private final static Queue<SoftReference<BinaryBuffer>> POOLED_BUFFERS = new ConcurrentLinkedQueue<>();
private final static int BUFFER_SIZE = 262_143; private final static int BUFFER_SIZE = 262_143;
private final Worker worker; private final Worker worker;
@ -320,7 +321,9 @@ public class PlayerSocketConnection extends PlayerConnection {
public void disconnect() { public void disconnect() {
this.worker.disconnect(this, channel); this.worker.disconnect(this, channel);
synchronized (bufferLock) { synchronized (bufferLock) {
POOLED_BUFFERS.addAll(waitingBuffers); for (BinaryBuffer waitingBuffer : waitingBuffers) {
POOLED_BUFFERS.add(new SoftReference<>(waitingBuffer));
}
this.waitingBuffers.clear(); this.waitingBuffers.clear();
} }
} }
@ -459,12 +462,17 @@ public class PlayerSocketConnection extends PlayerConnection {
} }
private static BinaryBuffer getPooledBuffer() { private static BinaryBuffer getPooledBuffer() {
BinaryBuffer newBuffer = POOLED_BUFFERS.poll(); BinaryBuffer buffer = null;
if (newBuffer == null) { SoftReference<BinaryBuffer> ref;
newBuffer = BinaryBuffer.ofSize(BUFFER_SIZE); while ((ref = POOLED_BUFFERS.poll()) != null) {
} else { buffer = ref.get();
newBuffer.clear(); if (buffer != null) break;
} }
return newBuffer; if (buffer == null) {
buffer = BinaryBuffer.ofSize(BUFFER_SIZE);
} else {
buffer.clear();
}
return buffer;
} }
} }