From 3cb5f612c6390c9f0fc49e25e6ec43981fe6f64d Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Wed, 7 Aug 2024 14:56:44 +0200 Subject: [PATCH 1/2] use world name as thread id --- .../com/volmit/iris/engine/service/MantleCleanerSVC.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java b/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java index 6d344bb27..e8e4595b3 100644 --- a/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java +++ b/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java @@ -57,7 +57,7 @@ public class MantleCleanerSVC extends IrisEngineService { return tectonicLimit.get(); } - private static Ticker createTrimmer(int id, Engine engine) { + private static Ticker createTrimmer(Engine engine) { return new Ticker(() -> { if (engine.isClosed()) return -1; long start = M.ms(); @@ -72,10 +72,10 @@ public class MantleCleanerSVC extends IrisEngineService { if (engine.isClosed()) return -1; int size = getEngineCount(); return Math.max(1000 / size - (M.ms() - start), 0); - }, "Iris Mantle Trimmer-" + id); + }, "Iris Mantle Trimmer - " + engine.getWorld().name()); } - private static Ticker createUnloader(int id, Engine engine) { + private static Ticker createUnloader(Engine engine) { return new Ticker(() -> { if (engine.isClosed()) return -1; long start = M.ms(); @@ -90,7 +90,7 @@ public class MantleCleanerSVC extends IrisEngineService { if (engine.isClosed()) return -1; int size = getEngineCount(); return Math.max(1000 / size - (M.ms() - start), 0); - }, "Iris Mantle Unloader-" + id); + }, "Iris Mantle Unloader - " + engine.getWorld().name()); } private static class Ticker extends Looper { From 29199dc2d20d7eb75b148365625f4f39f4256e2a Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Wed, 7 Aug 2024 14:57:53 +0200 Subject: [PATCH 2/2] woops --- .../com/volmit/iris/engine/service/MantleCleanerSVC.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java b/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java index e8e4595b3..d2f8a862b 100644 --- a/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java +++ b/core/src/main/java/com/volmit/iris/engine/service/MantleCleanerSVC.java @@ -17,8 +17,6 @@ import static com.volmit.iris.engine.service.EngineStatusSVC.getEngineCount; public class MantleCleanerSVC extends IrisEngineService { private static final AtomicInteger tectonicLimit = new AtomicInteger(30); - private static final AtomicInteger idCounter = new AtomicInteger(); - private int id = -1; private Ticker trimmer; private Ticker unloader; @@ -30,11 +28,10 @@ public class MantleCleanerSVC extends IrisEngineService { public void onEnable(boolean hotload) { if (engine.isStudio() && !IrisSettings.get().getPerformance().trimMantleInStudio) return; - if (id == -1) id = idCounter.getAndIncrement(); if (trimmer == null || !trimmer.isAlive()) - trimmer = createTrimmer(id, engine); + trimmer = createTrimmer(engine); if (unloader == null || !unloader.isAlive()) - unloader = createUnloader(id, engine); + unloader = createUnloader(engine); } @Override