Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add ThreadDump to debug-dump-command

This commit is contained in:
Blue (Lukas Rieger) 2021-09-15 01:09:45 +02:00
parent b4832fd237
commit b06ef68d99
No known key found for this signature in database
GPG Key ID: 904C4995F9E1F800
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/rendermanager/WorldRegionRenderTask.java
View File

@ -34,18 +34,19 @@ import de.bluecolored.bluemap.core.world.Region;
import java.util.*;
import java.util.stream.Collectors;
@DebugDump
public class WorldRegionRenderTask implements RenderTask {
@DebugDump private final BmMap map;
@DebugDump private final Vector2i worldRegion;
@DebugDump private final boolean force;
private final BmMap map;
private final Vector2i worldRegion;
private final boolean force;
private Deque<Vector2i> tiles;
@DebugDump private int tileCount;
@DebugDump private long startTime;
private int tileCount;
private long startTime;
@DebugDump private volatile int atWork;
@DebugDump private volatile boolean cancelled;
private volatile int atWork;
private volatile boolean cancelled;
public WorldRegionRenderTask(BmMap map, Vector2i worldRegion) {
this(map, worldRegion, false);
@ -151,11 +152,13 @@ public class WorldRegionRenderTask implements RenderTask {
}
@Override
@DebugDump
public synchronized boolean hasMoreWork() {
return !cancelled && (tiles == null || !tiles.isEmpty());
}
@Override
@DebugDump
public double estimateProgress() {
if (tiles == null) return 0;
if (tileCount == 0) return 1;

23
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/debug/StateDumper.java
View File

@ -54,6 +54,15 @@ public class StateDumper {
Set<Object> alreadyDumped = Collections.newSetFromMap(new WeakHashMap<>());
try {
ConfigurationNode threadDump = node.node("threads");
for (Thread thread : Thread.getAllStackTraces().keySet()) {
dumpInstance(thread, loader.defaultOptions(), threadDump.appendListNode(), alreadyDumped);
}
} catch (SecurityException ex){
node.node("threads").set(ex.toString());
}
ConfigurationNode dump = node.node("dump");
for (Object instance : instances) {
Class<?> type = instance.getClass();
@ -138,6 +147,20 @@ public class StateDumper {
return;
}
if (instance instanceof Thread) {
Thread t = (Thread) instance;
node.node("name").set(t.getName());
node.node("state").set(t.getState().toString());
node.node("priority").set(t.getPriority());
node.node("alive").set(t.isAlive());
node.node("id").set(t.getId());
node.node("deamon").set(t.isDaemon());
node.node("interrupted").set(t.isInterrupted());
dumpInstance(t.getStackTrace(), options, node.node("stackTrace"), alreadyDumped);
return;
}
boolean allFields = type.isAnnotationPresent(DebugDump.class);
boolean foundSomething = false;