From 34bfe513f1ce45b2fe880a8a8f4bb4aae02e5696 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Thu, 8 Jan 2026 20:53:32 -0800 Subject: [PATCH] Maybe less deadlock-y (#1241) --- .../RenderSectionManagerAccessor.java | 3 ++ .../AngelicaChunkBuilderMeshingTask.java | 35 +++++++++++++++---- .../AngelicaRenderSectionManager.java | 23 ++++++++++++ .../terrain/MixinRenderSectionManager.java | 11 ++++++ 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/RenderSectionManagerAccessor.java b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/RenderSectionManagerAccessor.java index c75050cec..496068479 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/RenderSectionManagerAccessor.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/RenderSectionManagerAccessor.java @@ -3,6 +3,9 @@ package com.gtnewhorizons.angelica.mixins.interfaces; import it.unimi.dsi.fastutil.longs.Long2ReferenceMap; import org.embeddedt.embeddium.impl.render.chunk.RenderSection; +import java.util.concurrent.ConcurrentLinkedDeque; + public interface RenderSectionManagerAccessor { Long2ReferenceMap angelica$getSectionByPosition(); + ConcurrentLinkedDeque angelica$getAsyncSubmittedTasks(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java index d1cd37599..03252dccf 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java @@ -38,12 +38,17 @@ import java.util.List; import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask { protected final RenderSection render; protected final int buildTime; protected final Vector3d camera; + private static final long DEFERRED_BLOCK_TIMEOUT_MS = 10_000; // 10 seconds + private static final int MAX_RETRIES = 2; + protected record DeferredBlock(int x, int y, int z, Block block, int meta, int pass) {} public AngelicaChunkBuilderMeshingTask(RenderSection render, int time, Vector3d camera) { @@ -255,13 +260,29 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask= MAX_RETRIES) { + return; + } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } catch (ExecutionException e) { + throw new RuntimeException("Error during main thread deferred block rendering", e); + } } } diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java index ef0b49318..d5211639f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaRenderSectionManager.java @@ -32,6 +32,8 @@ import com.gtnewhorizons.angelica.mixins.interfaces.RenderSectionManagerAccessor import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.concurrent.locks.LockSupport; +import java.util.function.BooleanSupplier; public class AngelicaRenderSectionManager extends RenderSectionManager { private boolean initialCameraSectionReady = false; @@ -197,4 +199,25 @@ public class AngelicaRenderSectionManager extends RenderSectionManager { } super.renderLayer(matrices, pass, occlusionCamera, camera); } + + /** + * Process both asyncSubmittedTasks and AngelicaRenderQueue.TASKS. + */ + @Override + public void managedBlock(BooleanSupplier isDone) { + final RenderSectionManagerAccessor accessor = (RenderSectionManagerAccessor) this; + while (!isDone.getAsBoolean()) { + Runnable task = accessor.angelica$getAsyncSubmittedTasks().poll(); + if (task != null) { + task.run(); + continue; + } + + if (AngelicaRenderQueue.processTasks(1) > 0) { + continue; + } + + LockSupport.parkNanos("Wait", 100000L); + } + } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderSectionManager.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderSectionManager.java index 6c8ffa87c..6e13210ef 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderSectionManager.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/celeritas/terrain/MixinRenderSectionManager.java @@ -8,6 +8,8 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import java.util.concurrent.ConcurrentLinkedDeque; + @Mixin(value = RenderSectionManager.class, remap = false) public class MixinRenderSectionManager implements RenderSectionManagerAccessor { @@ -15,8 +17,17 @@ public class MixinRenderSectionManager implements RenderSectionManagerAccessor { @Final private Long2ReferenceMap sectionByPosition; + @Shadow + @Final + private ConcurrentLinkedDeque asyncSubmittedTasks; + @Override public Long2ReferenceMap angelica$getSectionByPosition() { return sectionByPosition; } + + @Override + public ConcurrentLinkedDeque angelica$getAsyncSubmittedTasks() { + return asyncSubmittedTasks; + } }