Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-28 19:49:06 +00:00
Code Issues Releases Activity

smth like this

Browse Source
This commit is contained in:
RePixelatedMC
2023-11-24 13:08:42 +01:00
parent 8bb1964b30
commit 0adfe6911f
5 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/volmit/iris/core/IrisSettings.java
View File

@@ -141,8 +141,10 @@ public class IrisSettings {
public int resourceLoaderCacheSize = 1_024;
public int objectLoaderCacheSize = 4_096;
public int scriptLoaderCacheSize = 512;
public int tectonicUnloadThreads = 1;
public int tectonicUnloadThreads = -1; // -1 = Disabled and instead use the dynamic method
public boolean dynamicPerformanceMode = true;
public boolean AggressiveTectonicUnload = false;
public int AggressiveTectonicThreshold = -1; // -1 = Disabled and instead uses the tectonicLimit
}
@Data

1
core/src/main/java/com/volmit/iris/core/commands/CommandDeveloper.java
View File

@@ -54,6 +54,7 @@ public class CommandDeveloper implements DecreeExecutor {
Iris.info("-------------------------");
Iris.info(C.DARK_PURPLE + "Engine Status");
Iris.info(C.DARK_PURPLE + "Tectonic Threads: " + C.LIGHT_PURPLE + engine.getMantle().getDynamicThreads());
Iris.info(C.DARK_PURPLE + "Tectonic Limit: " + C.LIGHT_PURPLE + engine.getMantle().getTectonicLimit());
Iris.info(C.DARK_PURPLE + "Tectonic Plates: " + C.LIGHT_PURPLE + engine.getMantle().getLoadedRegionCount());
Iris.info(C.DARK_PURPLE + "Tectonic ToUnload: " + C.LIGHT_PURPLE + engine.getMantle().getToUnload());

4
core/src/main/java/com/volmit/iris/core/service/DynamicPerformanceSVC.java
View File

@@ -39,7 +39,6 @@ public class DynamicPerformanceSVC implements IrisService {
public void onEnable() {
this.plugin = Iris.instance;
if (IrisSettings.get().getPerformance().dynamicPerformanceMode) {
Iris.info("Enabled DynamicPerformance");
this.startupPerformance();
this.DynamicPerformance();
ticker.start();
@@ -52,7 +51,6 @@ public class DynamicPerformanceSVC implements IrisService {
protected long loop() {
try {
} catch (Throwable e) {
Iris.reportError(e);
e.printStackTrace();
@@ -71,7 +69,7 @@ public class DynamicPerformanceSVC implements IrisService {
tectonicLimit.getAndAdd(1);
t = t - 250;
}
//tectonicLimit.set(10);
tectonicLimit.set(10);
}
}

5
core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java
View File

@@ -293,7 +293,10 @@ public interface EngineMantle extends IObjectPlacer {
}
default long getToUnload(){
return Mantle.FakeToUnload.get();
return Mantle.fakeToUnload.get();
}
default long getDynamicThreads(){
return Mantle.dynamicThreads.get();
}
default double getTectonicLimit(){
return getMantle().tectonicLimit.get();

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

@@ -397,15 +397,53 @@ public class Mantle {
* @param baseIdleDuration the duration
*/
public static AtomicInteger FakeToUnload = new AtomicInteger(0);
@Getter
public static AtomicInteger fakeToUnload = new AtomicInteger(0);
public static AtomicInteger oldFakeToUnload = new AtomicInteger((0));
public static AtomicDouble adjustedIdleDuration = new AtomicDouble(0);
public static AtomicInteger tectonicLimit = new AtomicInteger(30);
public static AtomicInteger dynamicThreads = new AtomicInteger(1);
public static AtomicInteger forceAggressiveThreshold = new AtomicInteger(30);
public int g = 0;
public synchronized void trim(long baseIdleDuration) {
if (closed.get()) {
throw new RuntimeException("The Mantle is closed");
}
if (forceAggressiveThreshold.get() <= -1) {
forceAggressiveThreshold.set(IrisSettings.get().getPerformance().getAggressiveTectonicThreshold());
} else {
forceAggressiveThreshold.set(tectonicLimit.get());
}
if(IrisSettings.get().getPerformance().dynamicPerformanceMode) {
int h = dynamicThreads.get() - 1;
if (fakeToUnload.get() != 0) {
if (fakeToUnload.get() > oldFakeToUnload.get()) {
g++;
if (g >= 2 && IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getParallelism()) > h && IrisSettings.getThreadCount(IrisSettings.get().getConcurrency().getParallelism()) != h) {
dynamicThreads.addAndGet(1);
}
} else {
g--;
}
} else {
if (dynamicThreads.get() >= 2) {
dynamicThreads.addAndGet(-1);
}
}
oldFakeToUnload = fakeToUnload;
}
if (!IrisSettings.get().getPerformance().dynamicPerformanceMode){
if(IrisSettings.get().getPerformance().getTectonicUnloadThreads() <= -1){
dynamicThreads.set(1);
} else {
dynamicThreads.set(IrisSettings.get().getPerformance().getTectonicUnloadThreads());
}
}
int dth = dynamicThreads.get();
adjustedIdleDuration.set(baseIdleDuration);
if (loadedRegions != null) {
@@ -431,14 +469,13 @@ public class Mantle {
hyperLock.withLong(i, () -> {
if (M.ms() - lastUse.get(i) >= finalAdjustedIdleDuration) {
finalToUnload1.add(i);
FakeToUnload.addAndGet(1);
fakeToUnload.addAndGet(1);
Iris.debug("Tectonic Region added to unload");
}
});
}
/*
if (loadedRegions.size() > tectonicLimit.get()) {
if (IrisSettings.get().getPerformance().AggressiveTectonicUnload && loadedRegions.size() > tectonicLimit.get() && tectonicLimit.get() > forceAggressiveThreshold.get()) {
AtomicInteger dummyLoadedRegions = new AtomicInteger(loadedRegions.size());
for (; dummyLoadedRegions.get() > tectonicLimit.get();) {
@@ -457,7 +494,7 @@ public class Mantle {
hyperLock.withLong(oldestOverFiveSeconds, () -> {
if (M.ms() - lastUse.get(oldestOverFiveSeconds) >= adjustedIdleDuration.get()) {
finalToUnload.add(oldestOverFiveSeconds);
FakeToUnload.addAndGet(1);
fakeToUnload.getAndAdd(1);
Iris.debug("Oldest Tectonic Region over 5 seconds idle added to unload");
dummyLoadedRegions.getAndDecrement();
}
@@ -468,13 +505,11 @@ public class Mantle {
}
}
}
*/
BurstExecutor burstExecutor = new BurstExecutor(Executors.newFixedThreadPool(IrisSettings.get().getPerformance().tectonicUnloadThreads), toUnload.size());
// BurstExecutor burstExecutor = new BurstExecutor(Executors.newFixedThreadPool(1), toUnload.size());
for (Long i : toUnload) {
burstExecutor.queue(() -> {
// burstExecutor.queue(() -> {
hyperLock.withLong(i, () -> {
TectonicPlate m = loadedRegions.get(i);
if (m != null) {
@@ -482,16 +517,16 @@ public class Mantle {
m.write(fileForRegion(dataFolder, i));
loadedRegions.remove(i);
lastUse.remove(i);
fakeToUnload.getAndAdd(-1);
Iris.debug("Unloaded Tectonic Plate " + C.DARK_GREEN + Cache.keyX(i) + " " + Cache.keyZ(i));
FakeToUnload.addAndGet(-1);
} catch (IOException e) {
e.printStackTrace();
}
}
});
});
// });
}
burstExecutor.complete();
// burstExecutor.complete();
} finally {
io.set(false);