perf(celeritas): sync upstream to f15085d4 (update dispatch + task submission fixes) (#105)

Port upstream celeritas commits b4f69b8f and f15085d4 (cdafa232..f15085d4).

b4f69b8f "Fix important updates not taking effect sometimes":
- ChunkRebuildLists: the shared static EMPTY record exposed a mutable
  EnumMap that one pass's rebuild list writes could contaminate with;
  replaced by a fresh empty() factory per use (RenderListManager).
- RenderSectionManager.promoteInterimRebuildList: no longer skipped
  when a graph update is pending; sections with important update types
  are still promoted in that case, and the request set is cleared by
  the method itself. Null pending updates (defensive) are skipped.
- scheduleTranslucencyUpdates: inject through rebuildLists.get(update)
  instead of duplicating the SORT/IMPORTANT_SORT selection.
- scheduleSectionForRebuild: decide promotion by the section's new
  update type (requestUpdate may promote REBUILD to IMPORTANT_REBUILD)
  instead of the originally requested importance.

f15085d4 "Improve robustness of task submission":
- ChunkJobTyped.execute: cancelled jobs now still reach their consumer
  with a null result instead of returning early, so waiting collectors
  always get their semaphore permit back; started flag is only set for
  non-cancelled jobs.
- ChunkJobCollector.onJobFinished: nullable result, forwarded only
  when non-null. The sole scheduleTask consumer is collector::onJobFinished,
  so null results no longer reach the build results list.
- awaitCompletion: do not skip stealing cancelled (not started) jobs.
- ChunkBuilder.scheduleTask: consumer annotated @nullable.

The local Actinium adaptations in RenderSectionManager (cancelled
in-flight build handling) and ChunkBuilder are preserved; the ported
chunks match upstream f15085d4 verbatim.

Author: DHJComical

celeritas-common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/RenderSectionManager.java

@@ -269,8 +269,6 @@ private void checkTranslucencyChange() {
     private void scheduleTranslucencyUpdates(int camSectionX, int camSectionY, int camSectionZ) {
         var renderListManager = this.getCurrentRenderListManager();
         var rebuildLists = renderListManager.getRebuildLists().byUpdateType();
-        var sortRebuildList = rebuildLists.get(ChunkUpdateType.SORT);
-        var importantSortRebuildList = rebuildLists.get(ChunkUpdateType.IMPORTANT_SORT);
         var allowImportant = allowImportantRebuilds();
         var translucentPass = this.renderPassConfiguration.defaultTranslucentMaterial().pass;
         if (!this.hasTranslucencySortedSections()) {
@@ -317,8 +315,8 @@ private void scheduleTranslucencyUpdates(int camSectionX, int camSectionY, int c
 
                 if (cameraChangedSection || section.isAlignedWithSectionOnGrid(camSectionX, camSectionY, camSectionZ)) {
                     section.setPendingUpdate(update);
-                    // Inject it into the rebuild lists
-                    (update == ChunkUpdateType.IMPORTANT_SORT ? importantSortRebuildList : sortRebuildList).add(section);
+                    // Inject it into the appropriate list
+                    rebuildLists.get(update).add(section);
 
                     section.lastCameraX = cameraPosition.x;
                     section.lastCameraY = cameraPosition.y;
@@ -478,10 +476,25 @@ private boolean rebuildListHasUpdates() {
      * Inject sections that requested a rebuild between graph updates into the appropriate rebuild lists.
      */
     private void promoteInterimRebuildList() {
+        if (this.sectionsRequestingUpdate.isEmpty()) {
+            return;
+        }
+
         var rebuildLists = this.getCurrentRenderListManager().getRebuildLists().byUpdateType();
+        boolean graphUpdatePending = this.getCurrentRenderListManager().isNeedsUpdate();
+
         for (var section : this.sectionsRequestingUpdate) {
-            rebuildLists.get(section.getPendingUpdate()).add(section);
+            var updateType = section.getPendingUpdate();
+            if (updateType == null) {
+                // should never happen, but be defensive
+                continue;
+            }
+            if (!graphUpdatePending || updateType.isImportant()) {
+                rebuildLists.get(updateType).add(section);
+            }
         }
+
+        this.sectionsRequestingUpdate.clear();
     }
 
     public void updateChunks(boolean updateImmediately) {
@@ -497,13 +510,7 @@ public void updateChunks(boolean updateImmediately) {
             this.builder.tickSchedulingBudget();
         }
 
-        // Promotion of the interim rebuild list is not required if a graph update is requested, as the graph
-        // generates a new rebuild list anyway
-        if (!this.renderListManager.isNeedsUpdate() && !sectionsRequestingUpdate.isEmpty()) {
-            this.promoteInterimRebuildList();
-        }
-
-        this.sectionsRequestingUpdate.clear();
+        this.promoteInterimRebuildList();
 
         if (!rebuildListHasUpdates()) {
             // Nothing was dispatched, so the workers cannot have been starved for lack of budget.
@@ -873,7 +880,12 @@ protected void scheduleSectionForRebuild(int x, int y, int z, boolean important)
             }
 
             if (section.requestUpdate(pendingUpdate) || cancelledInFlightBuild) {
-                if (!this.getCurrentRenderListManager().isNeedsUpdate() && this.sectionsRequestingUpdate.size() < this.builder.getSchedulingBudget()) {
+                // Check importance using the section's new update type, as it may not be exactly what we requested
+                important = section.getPendingUpdate().isImportant();
+
+                if (important ||
+                        (!this.getCurrentRenderListManager().isNeedsUpdate() &&
+                            this.sectionsRequestingUpdate.size() < this.builder.getSchedulingBudget())) {
                     this.sectionsRequestingUpdate.add(section);
                 } else {
                     this.markGraphDirty();

celeritas-common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/executor/ChunkBuilder.java

@@ -5,6 +5,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.embeddedt.embeddium.impl.render.chunk.compile.GlobalChunkBuildContext;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -186,7 +187,7 @@ private void shutdownThreads() {
     }
 
     public <TASK extends ChunkBuilderTask<OUTPUT>, OUTPUT> ChunkJobTyped<TASK, OUTPUT> scheduleTask(TASK task, boolean important,
-                                                                                                    Consumer<ChunkJobResult<OUTPUT>> consumer)
+                                                                                                    Consumer<@Nullable ChunkJobResult<OUTPUT>> consumer)
     {
         Objects.requireNonNull(task, "Task must be non-null");
 

celeritas-common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/executor/ChunkJobCollector.java

@@ -1,6 +1,7 @@
 package org.embeddedt.embeddium.impl.render.chunk.compile.executor;
 
 import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkTaskOutput;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,9 +21,11 @@ public ChunkJobCollector(int budget, Consumer<ChunkJobResult<? extends ChunkTask
         this.collector = collector;
     }
 
-    public void onJobFinished(ChunkJobResult<? extends ChunkTaskOutput> result) {
+    public void onJobFinished(@Nullable ChunkJobResult<? extends ChunkTaskOutput> result) {
         this.semaphore.release(1);
-        this.collector.accept(result);
+        if (result != null) {
+            this.collector.accept(result);
+        }
     }
 
     public void awaitCompletion(ChunkBuilder builder) {
@@ -31,7 +34,8 @@ public void awaitCompletion(ChunkBuilder builder) {
         }
 
         for (var job : this.submitted) {
-            if (job.isStarted() || job.isCancelled()) {
+            // Don't try to steal jobs that already started (cancelled jobs are harmless to steal)
+            if (job.isStarted()) {
                 continue;
             }
 

celeritas-common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/executor/ChunkJobTyped.java

@@ -2,19 +2,20 @@
 
 import org.embeddedt.embeddium.impl.render.chunk.compile.ChunkBuildContext;
 import org.embeddedt.embeddium.impl.render.chunk.compile.tasks.ChunkBuilderTask;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Consumer;
 
 public class ChunkJobTyped<TASK extends ChunkBuilderTask<OUTPUT>, OUTPUT>
         implements ChunkJob
 {
     private final TASK task;
-    private final Consumer<ChunkJobResult<OUTPUT>> consumer;
+    private final Consumer<@Nullable ChunkJobResult<OUTPUT>> consumer;
 
     private volatile boolean cancelled;
     private volatile boolean started;
 
-    ChunkJobTyped(TASK task, Consumer<ChunkJobResult<OUTPUT>> consumer) {
+    ChunkJobTyped(TASK task, Consumer<@Nullable ChunkJobResult<OUTPUT>> consumer) {
         this.task = task;
         this.consumer = consumer;
     }
@@ -31,29 +32,24 @@ public void setCancelled() {
 
     @Override
     public void execute(ChunkBuildContext context) {
-        // Task was cancelled before starting
-        if (this.cancelled) {
-            return;
-        }
-
-        this.started = true;
+        ChunkJobResult<OUTPUT> result = null;
 
-        ChunkJobResult<OUTPUT> result;
+        if (!this.cancelled) {
+            this.started = true;
 
-        long startTime = System.nanoTime();
+            long startTime = System.nanoTime();
 
-        try {
-            var output = this.task.execute(context, this);
+            try {
+                var output = this.task.execute(context, this);
 
-            // Task was cancelled while executing
-            if (output == null) {
-                return;
+                // A null output means the task was cancelled while executing
+                if (output != null) {
+                    result = new ChunkJobResult.Success<>(output, System.nanoTime() - startTime);
+                }
+            } catch (Throwable throwable) {
+                result = new ChunkJobResult.Failure<>(throwable);
+                ChunkBuilder.LOGGER.error("Chunk build failed", throwable);
             }
-
-            result = new ChunkJobResult.Success<>(output, System.nanoTime() - startTime);
-        } catch (Throwable throwable) {
-            result = new ChunkJobResult.Failure<>(throwable);
-            ChunkBuilder.LOGGER.error("Chunk build failed", throwable);
         }
 
         try {

celeritas-common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/lists/ChunkRebuildLists.java

@@ -13,8 +13,6 @@
  * @param hasAdditionalUpdates whether there were additional updates not queued for efficiency reasons
  */
 public record ChunkRebuildLists(Map<ChunkUpdateType, ArrayDeque<RenderSection>> byUpdateType, boolean hasAdditionalUpdates, Map<ChunkUpdateType, Integer> queueOverflowCounts) {
-    public static final ChunkRebuildLists EMPTY;
-
     public int getUpdateCount(ChunkUpdateType type) {
         return byUpdateType.get(type).size() + queueOverflowCounts.getOrDefault(type, 0);
     }
@@ -31,13 +29,13 @@ public boolean isEmpty() {
         return true;
     }
 
-    static {
+    public static ChunkRebuildLists empty() {
         Map<ChunkUpdateType, ArrayDeque<RenderSection>> rebuildLists = new EnumMap<>(ChunkUpdateType.class);
 
         for (var type : ChunkUpdateType.values()) {
             rebuildLists.put(type, new ArrayDeque<>());
         }
 
-        EMPTY = new ChunkRebuildLists(rebuildLists, false, new EnumMap<>(ChunkUpdateType.class));
+        return new ChunkRebuildLists(rebuildLists, false, new EnumMap<>(ChunkUpdateType.class));
     }
 }

celeritas-common/src/main/java/org/embeddedt/embeddium/impl/render/chunk/lists/RenderListManager.java

@@ -95,7 +95,7 @@ public RenderListManager(SectionGraph graph, boolean shadow, AsyncOcclusionMode
         this.async = mode == AsyncOcclusionMode.EVERYTHING || (shadow && mode == AsyncOcclusionMode.ONLY_SHADOW);
         this.sectionTicker = sectionTicker;
         this.renderLists = SortedRenderLists.empty();
-        this.rebuildLists = ChunkRebuildLists.EMPTY;
+        this.rebuildLists = ChunkRebuildLists.empty();
     }
 
     /**