From dbc2d60ce08812cd55fc5bab7b6bd4bd8a71c77f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 20 Sep 2022 01:28:22 +0100 Subject: Make WorldCreator#keepSpawnLoaded return the WorldCreator (Fixes #8321) (#8371) * Make WorldCreator#keepSpawnLoaded return the WorldCreator (Fixes #8321) Thought that I fixed this before push/merge, apparently not, hence, fix the return type and add mitigation for this. * Fix patch/build * Rebuild patches --- .../api/0378-WorldCreator-keepSpawnLoaded.patch | 9 ++-- .../0943-Configurable-chat-thread-limit.patch | 55 ---------------------- .../0944-Configurable-chat-thread-limit.patch | 55 ++++++++++++++++++++++ ...fects-of-WorldCreator-keepSpawnLoaded-ret.patch | 25 ++++++++++ 4 files changed, 86 insertions(+), 58 deletions(-) delete mode 100644 patches/server/0943-Configurable-chat-thread-limit.patch create mode 100644 patches/server/0944-Configurable-chat-thread-limit.patch create mode 100644 patches/server/0945-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/api/0378-WorldCreator-keepSpawnLoaded.patch b/patches/api/0378-WorldCreator-keepSpawnLoaded.patch index 239a61f5a0..c148a391f4 100644 --- a/patches/api/0378-WorldCreator-keepSpawnLoaded.patch +++ b/patches/api/0378-WorldCreator-keepSpawnLoaded.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java -index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..355f9f27d29c65efebf099a72c37892a309edef1 100644 +index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..dc92ce261b9e67979da3f82cb75292ff980ad87e 100644 --- a/src/main/java/org/bukkit/WorldCreator.java +++ b/src/main/java/org/bukkit/WorldCreator.java @@ -22,6 +22,7 @@ public class WorldCreator { @@ -16,7 +16,7 @@ index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..355f9f27d29c65efebf099a72c37892a /** * Creates an empty WorldCreationOptions for the given world name -@@ -573,4 +574,29 @@ public class WorldCreator { +@@ -573,4 +574,32 @@ public class WorldCreator { return result; } @@ -38,10 +38,13 @@ index cbdcac688afb7c13dd7058fa522bbd2c5adc445e..355f9f27d29c65efebf099a72c37892a + * configuration, otherwise, will act as an override towards this setting + * + * @param keepSpawnLoaded the new value ++ * @return This object, for chaining + */ -+ public void keepSpawnLoaded(@NotNull net.kyori.adventure.util.TriState keepSpawnLoaded) { ++ @NotNull ++ public WorldCreator keepSpawnLoaded(@NotNull net.kyori.adventure.util.TriState keepSpawnLoaded) { + java.util.Objects.requireNonNull(keepSpawnLoaded, "keepSpawnLoaded"); + this.keepSpawnLoaded = keepSpawnLoaded; ++ return this; + } + + // Paper end diff --git a/patches/server/0943-Configurable-chat-thread-limit.patch b/patches/server/0943-Configurable-chat-thread-limit.patch deleted file mode 100644 index 45a442f6cf..0000000000 --- a/patches/server/0943-Configurable-chat-thread-limit.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Sun, 18 Sep 2022 06:33:17 +0100 -Subject: [PATCH] Configurable chat thread limit - -By default, spigot shifts chat over to an unbounded thread pool, -on a normal server, this really offers no gains, the creation of a thread -on submitting to the pool on these servers eats more time vs just running it in -the netty pipeline, however, on servers using plugins which do work in here, there -could be some overall benefits to moving this stuff outside of the pipeline. - -In general, this patch does two things: -1) Exposes the core size for the pool, this allows for ensuring that a number of threads -sit around in the pool, mitigating the need for creating new threads; This IS however -caveated, the ThreadPoolExecutor will ONLY create core threads as they're needed, it -just won't allow for us to dip back under the # of core threads, this can potentially -be mitigated by calling prestartCoreThread, however, I'm not sure if there is much justification -for this -2) Exposes a max size for the pool, as stated, by default this is unbounded, for most -servers limiting the size of the pool is going to have 0 effects given how fast chat -is actually processed, this is honestly really just exposed for the misnomers or people -who just wanna ensure that this won't grow over a specific size if chat gets stupidly active - -diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index aaecd691922a28e971b859175574c80a330edb8e..96b68840ef5c7c726e4c8c2d9f907196561a94bf 100644 ---- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -251,13 +251,26 @@ public class GlobalConfiguration extends ConfigurationPart { - public Misc misc; - - public class Misc extends ConfigurationPart { -+ -+ public ChatThreads chatThreads; - public class ChatThreads extends ConfigurationPart.Post { - private int chatExecutorCoreSize = -1; - private int chatExecutorMaxSize = -1; - - @Override - public void postProcess() { -- // TODO: FILL -+ //noinspection ConstantConditions -+ if (net.minecraft.server.MinecraftServer.getServer() == null) return; // In testing env, this will be null here -+ int _chatExecutorMaxSize = (chatExecutorMaxSize <= 0) ? Integer.MAX_VALUE : chatExecutorMaxSize; // This is somewhat dumb, but, this is the default, do we cap this?; -+ int _chatExecutorCoreSize = Math.max(chatExecutorCoreSize, 0); -+ -+ if (_chatExecutorMaxSize < _chatExecutorCoreSize) { -+ _chatExecutorMaxSize = _chatExecutorCoreSize; -+ } -+ -+ java.util.concurrent.ThreadPoolExecutor executor = (java.util.concurrent.ThreadPoolExecutor) net.minecraft.server.MinecraftServer.getServer().chatExecutor; -+ executor.setCorePoolSize(_chatExecutorCoreSize); -+ executor.setMaximumPoolSize(_chatExecutorMaxSize); - } - } - public int maxJoinsPerTick = 3; diff --git a/patches/server/0944-Configurable-chat-thread-limit.patch b/patches/server/0944-Configurable-chat-thread-limit.patch new file mode 100644 index 0000000000..45a442f6cf --- /dev/null +++ b/patches/server/0944-Configurable-chat-thread-limit.patch @@ -0,0 +1,55 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Sun, 18 Sep 2022 06:33:17 +0100 +Subject: [PATCH] Configurable chat thread limit + +By default, spigot shifts chat over to an unbounded thread pool, +on a normal server, this really offers no gains, the creation of a thread +on submitting to the pool on these servers eats more time vs just running it in +the netty pipeline, however, on servers using plugins which do work in here, there +could be some overall benefits to moving this stuff outside of the pipeline. + +In general, this patch does two things: +1) Exposes the core size for the pool, this allows for ensuring that a number of threads +sit around in the pool, mitigating the need for creating new threads; This IS however +caveated, the ThreadPoolExecutor will ONLY create core threads as they're needed, it +just won't allow for us to dip back under the # of core threads, this can potentially +be mitigated by calling prestartCoreThread, however, I'm not sure if there is much justification +for this +2) Exposes a max size for the pool, as stated, by default this is unbounded, for most +servers limiting the size of the pool is going to have 0 effects given how fast chat +is actually processed, this is honestly really just exposed for the misnomers or people +who just wanna ensure that this won't grow over a specific size if chat gets stupidly active + +diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +index aaecd691922a28e971b859175574c80a330edb8e..96b68840ef5c7c726e4c8c2d9f907196561a94bf 100644 +--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java ++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +@@ -251,13 +251,26 @@ public class GlobalConfiguration extends ConfigurationPart { + public Misc misc; + + public class Misc extends ConfigurationPart { ++ ++ public ChatThreads chatThreads; + public class ChatThreads extends ConfigurationPart.Post { + private int chatExecutorCoreSize = -1; + private int chatExecutorMaxSize = -1; + + @Override + public void postProcess() { +- // TODO: FILL ++ //noinspection ConstantConditions ++ if (net.minecraft.server.MinecraftServer.getServer() == null) return; // In testing env, this will be null here ++ int _chatExecutorMaxSize = (chatExecutorMaxSize <= 0) ? Integer.MAX_VALUE : chatExecutorMaxSize; // This is somewhat dumb, but, this is the default, do we cap this?; ++ int _chatExecutorCoreSize = Math.max(chatExecutorCoreSize, 0); ++ ++ if (_chatExecutorMaxSize < _chatExecutorCoreSize) { ++ _chatExecutorMaxSize = _chatExecutorCoreSize; ++ } ++ ++ java.util.concurrent.ThreadPoolExecutor executor = (java.util.concurrent.ThreadPoolExecutor) net.minecraft.server.MinecraftServer.getServer().chatExecutor; ++ executor.setCorePoolSize(_chatExecutorCoreSize); ++ executor.setMaximumPoolSize(_chatExecutorMaxSize); + } + } + public int maxJoinsPerTick = 3; diff --git a/patches/server/0945-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0945-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch new file mode 100644 index 0000000000..b571f18f1d --- /dev/null +++ b/patches/server/0945-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Mon, 19 Sep 2022 00:13:02 +0100 +Subject: [PATCH] Mitigate effects of WorldCreator#keepSpawnLoaded ret type + change + +TODO: Remove in 1.21? + +diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +index 27646d963bd1158f3fe0a9c0593a312404f0e7b0..128113e64731be9c0a4008ffb0a1eae78e221c47 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +@@ -434,6 +434,12 @@ public class Commodore + { + desc = getOriginalOrRewrite(desc); + } ++ if (owner.equals("org/bukkit/WorldCreator") && name.equals("keepSpawnLoaded") && desc.equals("(Lnet/kyori/adventure/util/TriState;)V")) { ++ super.visitMethodInsn(opcode, owner, name, "(Lnet/kyori/adventure/util/TriState;)Lorg/bukkit/WorldCreator;", itf); ++ // new method has a return, so, make sure we pop it ++ super.visitInsn(Opcodes.POP); ++ return; ++ } + // Paper end + + if ( modern ) -- cgit v1.2.3