mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-08-17 00:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

hopefully fix unsafe mantle chunk operations

Browse Source
This commit is contained in:
Julian Krings 2025-07-21 17:14:45 +02:00
parent 8262e52893
commit f50e964d4f
No known key found for this signature in database
GPG Key ID: 208C6E08C3B718D2
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/com/volmit/iris/util/mantle/Mantle.java
View File

@ -421,19 +421,19 @@ public class Mantle {
throw new RuntimeException("The Mantle is closed"); throw new RuntimeException("The Mantle is closed");
} }
adjustedIdleDuration.set(baseIdleDuration); double idleDuration = baseIdleDuration;
if (loadedRegions.size() > tectonicLimit) { if (loadedRegions.size() > tectonicLimit) {
// todo update this correctly and maybe do something when its above a 100% // todo update this correctly and maybe do something when its above a 100%
adjustedIdleDuration.set(Math.max(adjustedIdleDuration.get() - (1000 * (((loadedRegions.size() - tectonicLimit) / (double) tectonicLimit) * 100) * 0.4), 4000)); idleDuration = Math.max(idleDuration - (1000 * (((loadedRegions.size() - tectonicLimit) / (double) tectonicLimit) * 100) * 0.4), 4000);
} }
adjustedIdleDuration.set(idleDuration);
ioTrim.set(true); ioTrim.set(true);
try { try {
double adjustedIdleDuration = this.adjustedIdleDuration.get(); Iris.debug("Trimming Tectonic Plates older than " + Form.duration(idleDuration, 0));
Iris.debug("Trimming Tectonic Plates older than " + Form.duration(adjustedIdleDuration, 0));
if (lastUse.isEmpty()) return; if (lastUse.isEmpty()) return;
double unloadTime = M.ms() - adjustedIdleDuration; double unloadTime = M.ms() - idleDuration;
for (long id : lastUse.keySet()) { for (long id : lastUse.keySet()) {
hyperLock.withLong(id, () -> { hyperLock.withLong(id, () -> {
Long lastUseTime = lastUse.get(id); Long lastUseTime = lastUse.get(id);
@ -462,6 +462,7 @@ public class Mantle {
ioTectonicUnload.set(true); ioTectonicUnload.set(true);
try { try {
for (long id : toUnload) { for (long id : toUnload) {
double unloadTime = M.ms() - adjustedIdleDuration.get();
burst.queue(() -> hyperLock.withLong(id, () -> { burst.queue(() -> hyperLock.withLong(id, () -> {
TectonicPlate m = loadedRegions.get(id); TectonicPlate m = loadedRegions.get(id);
if (m == null) { if (m == null) {
@ -470,6 +471,11 @@ public class Mantle {
return; return;
} }
var used = lastUse.getOrDefault(id, 0L);
if (!toUnload.contains(id) || used >= unloadTime) {
return;
}
if (m.inUse()) { if (m.inUse()) {
Iris.debug("Tectonic Plate was added to unload while in use " + C.DARK_GREEN + m.getX() + " " + m.getZ()); Iris.debug("Tectonic Plate was added to unload while in use " + C.DARK_GREEN + m.getX() + " " + m.getZ());
lastUse.put(id, M.ms()); lastUse.put(id, M.ms());
@ -522,9 +528,11 @@ public class Mantle {
} }
} }
TectonicPlate p = loadedRegions.get(key(x, z)); Long key = key(x, z);
TectonicPlate p = loadedRegions.get(key);
if (p != null) { if (p != null) {
use(key);
return p; return p;
} }
@ -556,12 +564,12 @@ public class Mantle {
TectonicPlate p = loadedRegions.get(k); TectonicPlate p = loadedRegions.get(k);
if (p != null) { if (p != null) {
lastUse.put(k, M.ms()); use(k);
return CompletableFuture.completedFuture(p); return CompletableFuture.completedFuture(p);
} }
return ioBurst.completeValue(() -> hyperLock.withResult(x, z, () -> { return ioBurst.completeValue(() -> hyperLock.withResult(x, z, () -> {
lastUse.put(k, M.ms()); use(k);
TectonicPlate region = loadedRegions.get(k); TectonicPlate region = loadedRegions.get(k);
if (region != null) { if (region != null) {
@ -602,6 +610,11 @@ public class Mantle {
})); }));
} }
private void use(Long key) {
lastUse.put(key, M.ms());
toUnload.remove(key);
}
public void saveAll() { public void saveAll() {
} }