mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-01 23:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

potential fix for pregen deadlock

Browse Source
This commit is contained in:
Julian Krings 2024-08-25 19:35:49 +02:00
parent 414f46a08d
commit 38ad345f85
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java
View File

@ -93,7 +93,12 @@ public class PregeneratorJob implements PregenListener {
open();
}
J.a(this.pregenerator::start, 20);
var t = new Thread(() -> {
J.sleep(1000);
this.pregenerator.start();
}, "Iris Pregenerator");
t.setPriority(Thread.MIN_PRIORITY);
t.start();
}
public static boolean shutdownInstance() {

26
core/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java
View File

@ -29,15 +29,11 @@ import com.volmit.iris.util.math.M;
import com.volmit.iris.util.parallel.MultiBurst;
import com.volmit.iris.util.scheduling.J;
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.World;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.Future;
public class AsyncPregenMethod implements PregeneratorMethod {
@ -52,8 +48,8 @@ public class AsyncPregenMethod implements PregeneratorMethod {
}
this.world = world;
burst = MultiBurst.burst;
future = new KList<>(1024);
burst = new MultiBurst("Iris Async Pregen", Thread.NORM_PRIORITY);
future = new KList<>(256);
this.lastUse = new KMap<>();
}
@ -81,24 +77,17 @@ public class AsyncPregenMethod implements PregeneratorMethod {
private void completeChunk(int x, int z, PregenListener listener) {
try {
future.add(PaperLib.getChunkAtAsync(world, x, z, true).thenApply((i) -> {
if (i == null) {
}
Chunk c = Bukkit.getWorld(world.getUID()).getChunkAt(x, z);
lastUse.put(c, M.ms());
PaperLib.getChunkAtAsync(world, x, z, true).thenAccept((i) -> {
lastUse.put(i, M.ms());
listener.onChunkGenerated(x, z);
listener.onChunkCleaned(x, z);
return 0;
}));
}).join();
} catch (Throwable e) {
e.printStackTrace();
}
}
private void waitForChunksPartial(int maxWaiting) {
future.removeWhere(Objects::isNull);
while (future.size() > maxWaiting) {
try {
Future<?> i = future.remove(0);
@ -127,8 +116,6 @@ public class AsyncPregenMethod implements PregeneratorMethod {
e.printStackTrace();
}
}
future.removeWhere(Objects::isNull);
}
@Override
@ -145,6 +132,7 @@ public class AsyncPregenMethod implements PregeneratorMethod {
public void close() {
waitForChunks();
unloadAndSaveAllChunks();
burst.close();
}
@Override
@ -169,7 +157,7 @@ public class AsyncPregenMethod implements PregeneratorMethod {
if (future.size() > 256) {
waitForChunksPartial(256);
}
future.add(burst.complete(() -> completeChunk(x, z, listener)));
burst.complete(() -> completeChunk(x, z, listener));
}
@Override