mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-03 16:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add info message for failed increase of worker threads

Browse Source
This commit is contained in:
Julian Krings 2025-04-07 19:00:06 +02:00
parent fb0bc112e3
commit 566fca2b52
No known key found for this signature in database
GPG Key ID: 208C6E08C3B718D2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java
View File

@ -32,6 +32,7 @@ import io.papermc.lib.PaperLib;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
@ -150,19 +151,19 @@ public class AsyncPregenMethod implements PregeneratorMethod {
public static void increaseWorkerThreads() { public static void increaseWorkerThreads() {
THREAD_COUNT.updateAndGet(i -> { THREAD_COUNT.updateAndGet(i -> {
if (i > 0) return 1; if (i > 0) return 1;
var adjusted = IrisSettings.get().getConcurrency().getWorldGenThreads();
try { try {
var field = Class.forName("ca.spottedleaf.moonrise.common.util.MoonriseCommon").getDeclaredField("WORKER_POOL"); var field = Class.forName("ca.spottedleaf.moonrise.common.util.MoonriseCommon").getDeclaredField("WORKER_POOL");
var pool = field.get(null); var pool = field.get(null);
var threads = ((Thread[]) pool.getClass().getDeclaredMethod("getCoreThreads").invoke(pool)).length; var threads = ((Thread[]) pool.getClass().getDeclaredMethod("getCoreThreads").invoke(pool)).length;
var adjusted = IrisSettings.get().getConcurrency().getWorldGenThreads();
if (threads >= adjusted) return 0; if (threads >= adjusted) return 0;
pool.getClass().getDeclaredMethod("adjustThreadCount", int.class).invoke(pool, adjusted); pool.getClass().getDeclaredMethod("adjustThreadCount", int.class).invoke(pool, adjusted);
return threads; return threads;
} catch (ClassNotFoundException ignored) {
} catch (Throwable e) { } catch (Throwable e) {
Iris.error("Failed to increase worker threads"); Iris.warn("Failed to increase worker threads, please increase it manually to " + adjusted);
e.printStackTrace(); Iris.warn("For more information see https://docs.papermc.io/paper/reference/global-configuration#chunk_system_worker_threads");
if (e instanceof InvocationTargetException) e.printStackTrace();
} }
return 0; return 0;
}); });
@ -177,7 +178,6 @@ public class AsyncPregenMethod implements PregeneratorMethod {
var method = pool.getClass().getDeclaredMethod("adjustThreadCount", int.class); var method = pool.getClass().getDeclaredMethod("adjustThreadCount", int.class);
method.invoke(pool, i); method.invoke(pool, i);
return 0; return 0;
} catch (ClassNotFoundException ignored) {
} catch (Throwable e) { } catch (Throwable e) {
Iris.error("Failed to reset worker threads"); Iris.error("Failed to reset worker threads");
e.printStackTrace(); e.printStackTrace();