Skip to content

Use CollectionUsageThreshold, add cooldown #3491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SirYwell wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

Use CollectionUsageThreshold, add cooldown #3491

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions worldedit-core/src/main/java/com/fastasyncworldedit/core/Fawe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

/**
* [ WorldEdit action ]
Expand Down Expand Up @@ -413,26 +414,31 @@ private void setupMemoryListener() {
final MemoryMXBean memBean = ManagementFactory.getMemoryMXBean();
final NotificationEmitter ne = (NotificationEmitter) memBean;

AtomicLong lastWarn = new AtomicLong(System.currentTimeMillis());
ne.addNotificationListener((notification, handback) -> {
final long heapSize = Runtime.getRuntime().totalMemory();
final long heapMaxSize = Runtime.getRuntime().maxMemory();
if (heapSize < heapMaxSize) {
return;
}
LOGGER.warn("High memory usage detected, FAWE will attempt to slow operations to prevent a crash.");
final long time = System.currentTimeMillis();
if (time > lastWarn.get() + TimeUnit.SECONDS.toMillis(30)) {
lastWarn.set(time);
LOGGER.warn("High memory usage detected, FAWE will attempt to slow operations to prevent a crash.");
}
MemUtil.memoryLimitedTask();
}, null, null);

final List<MemoryPoolMXBean> memPools = ManagementFactory.getMemoryPoolMXBeans();
for (final MemoryPoolMXBean mp : memPools) {
if (mp.isUsageThresholdSupported()) {
if (mp.isCollectionUsageThresholdSupported()) {
final MemoryUsage mu = mp.getUsage();
final long max = mu.getMax();
if (max < 0) {
continue;
}
final long alert = (max * Settings.settings().MAX_MEMORY_PERCENT) / 100;
mp.setUsageThreshold(alert);
mp.setCollectionUsageThreshold(alert);
}
}
} catch (Throwable ignored) {
Expand Down
Loading