spigot/CraftBukkit-Patches/0037-Configurable-Amount-of-Netty-Threads.patch

49 lines
2.6 KiB
Diff
Raw Normal View History

2019-04-24 10:30:28 +10:00
From 11fd9cf5cd466dc88c82ab9803c1b43eec2c8daa Mon Sep 17 00:00:00 2001
2014-04-12 14:18:37 +10:00
From: md_5 <git@md-5.net>
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 cda73d9c..e36e8a3b 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -173,7 +173,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2019-04-23 12:00:00 +10:00
this.gameProfileRepository = gameprofilerepository;
this.userCache = usercache;
// this.universe = file; // CraftBukkit
2018-12-13 11:00:00 +11:00
- this.serverConnection = new ServerConnection(this); // CraftBukkit
+ // this.serverConnection = new ServerConnection(this); // CraftBukkit // Spigot
2019-04-23 12:00:00 +10:00
this.worldLoadListenerFactory = worldloadlistenerfactory;
// this.convertable = new Convertable(file.toPath(), file.toPath().resolve("../backups"), datafixer); // CraftBukkit - moved to DedicatedServer.init
2018-07-15 10:00:00 +10:00
this.dataConverterManager = datafixer;
@@ -1496,7 +1496,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2018-07-15 10:00:00 +10:00
2019-04-23 12:00:00 +10:00
@Nullable
2018-07-15 10:00:00 +10:00
public ServerConnection getServerConnection() {
2018-12-13 11:00:00 +11:00
- return this.serverConnection;
+ return this.serverConnection == null ? this.serverConnection = new ServerConnection(this) : this.serverConnection; // Spigot
2014-04-12 14:18:37 +10:00
}
2019-04-23 12:00:00 +10:00
public boolean ah() {
2014-04-12 14:18:37 +10:00
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
2019-04-23 09:33:25 +10:00
index 06081dc6..a4200e43 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -224,4 +224,11 @@ public class SpigotConfig
2014-04-12 14:18:37 +10:00
}
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 );
+ }
}
--
2019-04-23 09:33:25 +10:00
2.20.1
2014-04-12 14:18:37 +10:00