From d22f9071ff1c2cd8f4c0513a0e3d9b3e8e119a0c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 23:21:26 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation Fixes #294 Use a pending list to handle new connections so that the netty threads do not block waiting for the main thread to finish ticking --- ...blocking-on-Network-Manager-creation.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Spigot-Server-Patches/0158-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/Spigot-Server-Patches/0158-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0158-Avoid-blocking-on-Network-Manager-creation.patch new file mode 100644 index 0000000000..a685b234c6 --- /dev/null +++ b/Spigot-Server-Patches/0158-Avoid-blocking-on-Network-Manager-creation.patch @@ -0,0 +1,49 @@ +From 35daee4c95827a178f1f80c336d4e100f64fa91f Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Mon, 16 May 2016 23:19:16 -0400 +Subject: [PATCH] Avoid blocking on Network Manager creation + +Per Paper issue 294 + +diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java +index 4ab28e6..08634c3 100644 +--- a/src/main/java/net/minecraft/server/ServerConnection.java ++++ b/src/main/java/net/minecraft/server/ServerConnection.java +@@ -60,6 +60,17 @@ public class ServerConnection { + public volatile boolean d; + private final List g = Collections.synchronizedList(Lists.newArrayList()); + private final List h = Collections.synchronizedList(Lists.newArrayList()); ++ // Paper start - prevent blocking on adding a new network manager while the server is ticking ++ private final List pending = Collections.synchronizedList(Lists.newArrayList()); ++ private void addPending() { ++ synchronized (pending) { ++ synchronized (this.h) { // Paper // OBFHELPER - List of network managers ++ this.h.addAll(pending); ++ pending.clear(); ++ } ++ } ++ } ++ // Paper end + + public ServerConnection(MinecraftServer minecraftserver) { + this.f = minecraftserver; +@@ -94,7 +105,7 @@ public class ServerConnection { + channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyPingHandler(ServerConnection.this)).addLast("splitter", new PacketSplitter()).addLast("decoder", new PacketDecoder(EnumProtocolDirection.SERVERBOUND)).addLast("prepender", new PacketPrepender()).addLast("encoder", new PacketEncoder(EnumProtocolDirection.CLIENTBOUND)); + NetworkManager networkmanager = new NetworkManager(EnumProtocolDirection.SERVERBOUND); + +- ServerConnection.this.h.add(networkmanager); ++ pending.add(networkmanager); // Paper + channel.pipeline().addLast("packet_handler", networkmanager); + networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.f, networkmanager)); + } +@@ -123,6 +134,7 @@ public class ServerConnection { + + synchronized (this.h) { + // Spigot Start ++ addPending(); // Paper + // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order + if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 ) + { +-- +2.8.2 +