properly fixed getChunk() deadlocks

WearBlackAllDay · Sep 22, 2020 · 870c548 · 870c548
1 parent 64124c6
commit 870c548
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 41 deletions.
diff --git a/src/main/java/dimthread/DimThread.java b/src/main/java/dimthread/DimThread.java
@@ -24,7 +24,11 @@ public static void swapThreadsAndRun(Runnable task, Object... threadedObjects) {
 	}
 
 	public static void attach(Thread thread, ServerWorld world) {
-		thread.setName(MOD_ID + "_" + world.getRegistryKey().getValue().getPath());
+		attach(thread, world.getRegistryKey().getValue().getPath());
+	}
+
+	public static void attach(Thread thread, String name) {
+		thread.setName(MOD_ID + "_" + name);
 	}
 
 	public static boolean owns(Thread thread) {

diff --git a/src/main/java/dimthread/mixin/EntityMixin.java b/src/main/java/dimthread/mixin/EntityMixin.java
diff --git a/src/main/java/dimthread/mixin/MinecraftServerMixin.java b/src/main/java/dimthread/mixin/MinecraftServerMixin.java
@@ -18,6 +18,7 @@
 
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BooleanSupplier;
 
@@ -50,6 +51,7 @@ public Iterator<?> tickWorlds(Iterator<?> oldValue) {
 			target = "Ljava/lang/Iterable;iterator()Ljava/util/Iterator;"))
 	public void tickWorlds(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
 		AtomicReference<CrashReport> crashReport = new AtomicReference<>();
+		AtomicInteger completed = new AtomicInteger();
 
 		this.pool.iterate(this.getWorlds().iterator(), serverWorld -> {
 			DimThread.attach(Thread.currentThread(), serverWorld);
@@ -63,7 +65,14 @@ public void tickWorlds(BooleanSupplier shouldKeepTicking, CallbackInfo ci) {
 			}
 
 			try {
-				DimThread.swapThreadsAndRun(() -> serverWorld.tick(shouldKeepTicking), serverWorld, serverWorld.getChunkManager());
+				DimThread.swapThreadsAndRun(() -> {
+					serverWorld.tick(shouldKeepTicking);
+					completed.getAndIncrement();
+
+					while(completed.get() != 3) {
+						serverWorld.getChunkManager().executeQueuedTasks();
+					}
+				}, serverWorld, serverWorld.getChunkManager());
 			} catch(Throwable var6) {
 				crashReport.set(CrashReport.create(var6, "Exception ticking world"));
 				serverWorld.addDetailsToCrashReport(crashReport.get());

diff --git a/src/main/resources/dimthread.mixins.json b/src/main/resources/dimthread.mixins.json
@@ -7,8 +7,7 @@
     "MinecraftServerMixin",
     "ServerChunkManagerMixin",
     "RedstoneWireBlockMixin",
-    "WorldMixin",
-    "EntityMixin"
+    "WorldMixin"
   ],
   "client": [
   ],