From c2933cd397bee0d3f35cd0067caace8d9bc0121a Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 13 Dec 2013 11:58:58 +1100 Subject: [PATCH] Configurable Amount of Netty Threads This brings back the option that the Spigot version of netty saw. By default Netty will try and use cores*2 threads, however if running multiple servers on the same machine, this can be too many threads. Additionally some people have 16 core servers. If 32 Netty threads are allowed in this setup, then the lock contention, and thus blocking between threads becomes much greater, leading to decreased performance. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 51f1761..64fa9ab 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -54,7 +54,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo private final List n = new ArrayList(); private final ICommandHandler o; public final MethodProfiler methodProfiler = new MethodProfiler(); - private final ServerConnection p; + private ServerConnection p; // Spigot private final ServerPing q = new ServerPing(); private final Random r = new Random(); private String serverIp; @@ -113,7 +113,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo j = this; this.d = proxy; // this.universe = file1; // CraftBukkit - this.p = new ServerConnection(this); + // this.p = new ServerConnection(this); // Spigot this.o = new CommandDispatcher(); // this.convertable = new WorldLoaderServer(file1); // CraftBukkit - moved to DedicatedServer.init this.T = new YggdrasilAuthenticationService(proxy, UUID.randomUUID().toString()); @@ -1250,7 +1250,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo } // Spigot End public ServerConnection ai() { - return this.p; + return ( this.p ) == null ? this.p = new ServerConnection( this ) : this.p; // Spigot } public boolean ak() { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index 8bfffa5..b3278fd 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -202,4 +202,11 @@ public class SpigotConfig } bungee = getBoolean( "settings.bungeecord", false ); } + + private static void nettyThreads() + { + int count = getInt( "settings.netty-threads", 4 ); + System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) ); + Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count ); + } } -- 1.9.1