mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-08-31 21:49:13 +00:00
48 lines
2.6 KiB
Diff
48 lines
2.6 KiB
Diff
From a9aca8765835a16e3a357e07c3fcb47547627258 Mon Sep 17 00:00:00 2001
|
|
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 d690983c8..9d355d699 100644
|
|
--- 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
|
|
this.gameProfileRepository = gameprofilerepository;
|
|
this.userCache = usercache;
|
|
// this.universe = file; // CraftBukkit
|
|
- this.serverConnection = new ServerConnection(this); // CraftBukkit
|
|
+ // this.serverConnection = new ServerConnection(this); // CraftBukkit // Spigot
|
|
this.worldLoadListenerFactory = worldloadlistenerfactory;
|
|
// this.convertable = new Convertable(file.toPath(), file.toPath().resolve("../backups"), datafixer); // CraftBukkit - moved to DedicatedServer.init
|
|
this.dataConverterManager = datafixer;
|
|
@@ -1496,7 +1496,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
|
|
@Nullable
|
|
public ServerConnection getServerConnection() {
|
|
- return this.serverConnection;
|
|
+ return this.serverConnection == null ? this.serverConnection = new ServerConnection(this) : this.serverConnection; // Spigot
|
|
}
|
|
|
|
public boolean ah() {
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 06081dc64..a4200e43e 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -224,4 +224,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 );
|
|
+ }
|
|
}
|
|
--
|
|
2.20.1
|
|
|