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

Use lambda for socket selection

Browse Source
This commit is contained in:
TheMode 2021-08-08 21:14:53 +02:00
parent 09b7daa985
commit 99a3ad88a1
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/net/minestom/server/network/socket/Worker.java
View File

@ -12,7 +12,6 @@ import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
@ -31,37 +30,28 @@ public final class Worker {
private void threadTick(Context workerContext) {
try {
selector.select();
this.selector.select(key -> {
final SocketChannel channel = (SocketChannel) key.channel();
if (!channel.isOpen()) return;
if (!key.isReadable()) return;
var connection = connectionMap.get(channel);
try {
var readBuffer = workerContext.readBuffer;
// Consume last incomplete packet
connection.consumeCache(readBuffer);
// Read & process
readBuffer.readChannel(channel);
connection.processPackets(workerContext, packetProcessor);
} catch (IOException e) {
// TODO print exception? (should ignore disconnection)
connection.disconnect();
} finally {
workerContext.clearBuffers();
}
});
} catch (IOException e) {
e.printStackTrace();
return;
MinecraftServer.getExceptionManager().handleException(e);
}
Set<SelectionKey> selectedKeys = selector.selectedKeys();
for (SelectionKey key : selectedKeys) {
SocketChannel channel = (SocketChannel) key.channel();
if (!channel.isOpen()) {
continue;
}
if (!key.isReadable()) {
// We only care about read
continue;
}
var connection = connectionMap.get(channel);
try {
var readBuffer = workerContext.readBuffer;
// Consume last incomplete packet
connection.consumeCache(readBuffer);
// Read & process
readBuffer.readChannel(channel);
connection.processPackets(workerContext, packetProcessor);
} catch (IOException e) {
// TODO print exception? (should ignore disconnection)
connection.disconnect();
} finally {
workerContext.clearBuffers();
}
}
selectedKeys.clear();
}
public void receiveConnection(SocketChannel channel) throws IOException {