Skip to content

[release/3.11] fix: 游戏进程是 Java 11 以下时无法导出游戏运行栈 #5797

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
CiiLu wants to merge 1 commit into
base: release/3.11
Choose a base branch
from
Open

[release/3.11] fix: 游戏进程是 Java 11 以下时无法导出游戏运行栈 #5797

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
16 changes: 15 additions & 1 deletion HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameDumpGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import com.sun.tools.attach.AttachNotSupportedException;
import com.sun.tools.attach.VirtualMachine;
import org.jackhuang.hmcl.java.JavaInfo;
import org.jackhuang.hmcl.util.logging.Logger;
import org.jackhuang.hmcl.util.StringUtils;
import org.jackhuang.hmcl.util.platform.OperatingSystem;
Expand Down Expand Up @@ -128,7 +129,20 @@ public static void writeDumpHeadKeyValueTo(String key, String value, Writer writ
}

private static void writeDumpBodyTo(VirtualMachine vm, Writer writer) throws IOException {
execute(vm, "Thread.print -e -l", writer);
int vmVersion = -1;

try {
if (vm.getSystemProperties().get("java.version") instanceof String javaVersion)
vmVersion = JavaInfo.parseVersion(javaVersion);
} catch (Throwable e) {
LOG.warning("Failed to get VM system properties", e);
}

if (vmVersion >= 11)
execute(vm, "Thread.print -e -l", writer);
else
execute(vm, "Thread.print -l", writer);

}

private static VirtualMachine attachVM(String lvmid, Writer writer) throws IOException, InterruptedException {
Expand Down
Loading