mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
57 lines
2.8 KiB
Diff
57 lines
2.8 KiB
Diff
From edc862d79d59ff2cc77a068e722a11c3bfcd9abe 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 bc9ac2b..d616c4f 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -57,7 +57,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
|
private final List<ITickable> o = Lists.newArrayList();
|
|
protected final ICommandHandler b;
|
|
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 final DataConverterManager dataConverterManager;
|
|
@@ -122,7 +122,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
|
this.W = gameprofilerepository;
|
|
this.X = usercache;
|
|
// this.universe = file; // CraftBukkit
|
|
- this.p = new ServerConnection(this);
|
|
+ // this.p = new ServerConnection(this); // Spigot
|
|
this.b = this.i();
|
|
// this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
|
|
this.dataConverterManager = dataconvertermanager;
|
|
@@ -1303,7 +1303,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
|
}
|
|
// Spigot End
|
|
public ServerConnection am() {
|
|
- return this.p;
|
|
+ return this.p == null ? this.p = new ServerConnection(this) : this.p; // Spigot
|
|
}
|
|
|
|
public boolean ao() {
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 824ba7a..a306266 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -221,4 +221,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.5.0
|
|
|