2023-06-08 17:32:29 +10:00
From 37d5e23c145d716d40ea17d9a052368fad5d792a 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
2023-06-08 01:30:00 +10:00
index d954adfac..01179bc91 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
2023-03-15 03:30:00 +11:00
@@ -343,7 +343,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2022-06-08 02:00:00 +10:00
services.profileCache().setExecutor(this);
}
2021-06-11 15:00:00 +10:00
2022-06-08 02:00:00 +10:00
- this.connection = new ServerConnection(this);
+ // this.connection = new ServerConnection(this); // Spigot
this.progressListenerFactory = worldloadlistenerfactory;
this.storageSource = convertable_conversionsession;
this.playerDataStorage = convertable_conversionsession.createPlayerStorage();
2023-06-08 01:30:00 +10:00
@@ -1598,7 +1598,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
2021-11-22 09:00:00 +11:00
public ServerConnection getConnection() {
2021-06-11 15:00:00 +10:00
- return this.connection;
+ return this.connection == null ? this.connection = new ServerConnection(this) : this.connection; // Spigot
2014-04-12 14:18:37 +10:00
}
2021-11-22 09:00:00 +11:00
public boolean isReady() {
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
2023-04-10 08:30:55 +10:00
index 3bb51f452..c5989e8e9 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
2018-07-16 20:30:51 +10:00
@@ -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 );
+ }
}
--
2023-06-08 01:30:00 +10:00
2.40.1
2014-04-12 14:18:37 +10:00