Adjust backoff times

Blocking for too long may introduce unneccesary stalls
jpenilla · Jun 21, 2022 · b5bc463 · b5bc463
1 parent 4fb893c
commit b5bc463
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/common/src/main/java/xyz/jpenilla/squaremap/common/data/MapWorldInternal.java b/common/src/main/java/xyz/jpenilla/squaremap/common/data/MapWorldInternal.java
@@ -189,9 +189,10 @@ public void saveImage(final Image image) {
 
         long executed = this.imageIOExecutorExecutedTasks.get();
         long submitted = this.imageIOExecutorSubmittedTasks.get();
-        for (int failures = 0; (submitted - executed) >= IMAGEIO_MAX_TASKS; ++failures) {
+        for (int failures = 1; (submitted - executed) >= IMAGEIO_MAX_TASKS; ++failures) {
             boolean interrupted = Thread.interrupted();
-            LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(Math.min(50, failures)));
+            Thread.yield();
+            LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(Math.min(25, failures)));
             if (interrupted) {
                 Thread.currentThread().interrupt();
             }

diff --git a/common/src/main/java/xyz/jpenilla/squaremap/common/task/render/AbstractRender.java b/common/src/main/java/xyz/jpenilla/squaremap/common/task/render/AbstractRender.java
@@ -485,12 +485,13 @@ private static int applyDepthCheckerboard(final double fluidCountY, final int co
 
     private @Nullable ChunkSnapshot chunkSnapshot(final int x, final int z) {
         final CompletableFuture<ChunkSnapshot> future = this.chunkSnapshotProvider.asyncSnapshot(this.level, x, z, false);
-        for (int failures = 0; !future.isDone(); ++failures) {
+        for (int failures = 1; !future.isDone(); ++failures) {
             if (!this.running()) {
                 return null;
             }
             boolean interrupted = Thread.interrupted();
-            LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(Math.min(100, failures)));
+            Thread.yield();
+            LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(Math.min(5, failures)));
             if (interrupted) {
                 Thread.currentThread().interrupt();
             }