2014-07-21 22:46:54 +02:00
From 0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2015-02-28 12:36:22 +01:00
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
2016-02-29 22:33:06 +01:00
private final List<ITickable> o = Lists.newArrayList();
2015-02-28 12:36:22 +01:00
protected final ICommandHandler b;
2014-07-21 22:46:54 +02:00
public final MethodProfiler methodProfiler = new MethodProfiler();
2016-02-29 22:33:06 +01:00
- private final ServerConnection p;
+ private ServerConnection p; // Spigot
private final ServerPing q = new ServerPing();
private final Random r = new Random();
private final DataConverterManager dataConverterManager;
2015-02-28 12:36:22 +01:00
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
2016-02-29 22:33:06 +01:00
this.W = gameprofilerepository;
this.X = usercache;
2014-11-28 02:17:45 +01:00
// this.universe = file; // CraftBukkit
2016-02-29 22:33:06 +01:00
- this.p = new ServerConnection(this);
+ // this.p = new ServerConnection(this); // Spigot
this.b = this.i();
2014-11-28 02:17:45 +01:00
// this.convertable = new WorldLoaderServer(file); // CraftBukkit - moved to DedicatedServer.init
2016-02-29 22:33:06 +01:00
this.dataConverterManager = dataconvertermanager;
2015-02-28 12:36:22 +01:00
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
2014-07-21 22:46:54 +02:00
}
// Spigot End
2016-02-29 22:33:06 +01:00
public ServerConnection am() {
- return this.p;
+ return this.p == null ? this.p = new ServerConnection(this) : this.p; // Spigot
2014-07-21 22:46:54 +02:00
}
2016-02-29 22:33:06 +01:00
public boolean ao() {
2014-07-21 22:46:54 +02:00
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ 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 );
+ }
}
2015-07-12 11:59:20 +02:00
--