mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-17 14:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a rare crash - Crazydev

Browse Source
This commit is contained in:
RePixelatedMC
2023-12-30 14:36:07 +01:00
parent dff7665934
commit b9c88f5b12
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
+12 -7
View File
@@ -26,6 +26,7 @@ import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.EngineMantle;
import com.volmit.iris.engine.mantle.MantleWriter; import com.volmit.iris.engine.mantle.MantleWriter;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.BlockCoordinates;
import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates;
@@ -397,7 +398,7 @@ public class Mantle {
private final AtomicLong oldestTectonicPlate = new AtomicLong(0); private final AtomicLong oldestTectonicPlate = new AtomicLong(0);
private final ReentrantLock unloadLock = new ReentrantLock(); private final ReentrantLock unloadLock = new ReentrantLock();
@Getter @Getter
private final Set<Long> toUnload = new HashSet<>(); private final KList<Long> toUnload = new KList<>();
/** /**
* Save & unload regions that have not been used for more than the * Save & unload regions that have not been used for more than the
@@ -420,7 +421,7 @@ public class Mantle {
} }
ioTrim.set(true); ioTrim.set(true);
unloadLock.lock(); //unloadLock.lock();
try { try {
Iris.debug("Trimming Tectonic Plates older than " + Form.duration(adjustedIdleDuration.get(), 0)); Iris.debug("Trimming Tectonic Plates older than " + Form.duration(adjustedIdleDuration.get(), 0));
if (lastUse != null) { if (lastUse != null) {
@@ -442,14 +443,16 @@ public class Mantle {
} }
} }
public int unloadTectonicPlate(int tectonicLimit) { public synchronized int unloadTectonicPlate(int tectonicLimit) {
// todo: Make it advanced with bursts etc // todo: Make it advanced with bursts etc
AtomicInteger i = new AtomicInteger(); AtomicInteger i = new AtomicInteger();
unloadLock.lock(); unloadLock.lock();
BurstExecutor burst = null;
try { try {
BurstExecutor burst = MultiBurst.burst.burst(toUnload.size()); KList<Long> copy = toUnload.copy();
burst.setMulticore(toUnload.size() > tectonicLimit); burst = MultiBurst.burst.burst(copy.size());
for (long id : new ArrayList<>(toUnload)) { burst.setMulticore(copy.size() > tectonicLimit);
for (long id : copy) {
burst.queue(() -> burst.queue(() ->
hyperLock.withLong(id, () -> { hyperLock.withLong(id, () -> {
TectonicPlate m = loadedRegions.get(id); TectonicPlate m = loadedRegions.get(id);
@@ -469,8 +472,10 @@ public class Mantle {
} }
burst.complete(); burst.complete();
} catch (Exception e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
if (burst != null)
burst.complete();
} finally { } finally {
unloadLock.unlock(); unloadLock.unlock();
ioTectonicUnload.set(true); ioTectonicUnload.set(true);