Skip to content
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

新功能：在进程无响应时自动导出 jstack 信息 #5519

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

新功能：在进程无响应时自动导出 jstack 信息 #5519

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2202,7 +2202,8 @@ IgnoreCustomSkin:
WindowTitle = ArgumentReplace(WindowTitle, False)

'初始化等待
Dim Watcher As New Watcher(Loader, McVersionCurrent, WindowTitle)
Dim JStack As String = McLaunchJavaSelected.PathFolder & "jstack.exe"
Dim Watcher As New Watcher(Loader, McVersionCurrent, WindowTitle, If(File.Exists(JStack), JStack, ""))
McLaunchWatcher = Watcher

'等待
Expand Down
40 changes: 36 additions & 4 deletions Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@
Private WindowTitle As String = ""
Private PID As Integer
Public Loader As LoaderTask(Of Process, Integer)
Public Sub New(Loader As LoaderTask(Of Process, Integer), Version As McVersion, WindowTitle As String)
Private JSatckPath As String = ""
Public Sub New(Loader As LoaderTask(Of Process, Integer), Version As McVersion, WindowTitle As String, Optional JSatckPath As String = "")
Me.Loader = Loader
Me.Version = Version
Me.WindowTitle = WindowTitle
Me.PID = Loader.Input.Id
Me.JSatckPath = JSatckPath
WatcherLog("开始 Minecraft 日志监控")
If Me.WindowTitle <> "" Then WatcherLog("要求窗口标题：" & WindowTitle)

Expand All @@ -86,14 +88,14 @@
GameProcess.BeginErrorReadLine()
AddHandler GameProcess.OutputDataReceived, AddressOf LogReceived
AddHandler GameProcess.ErrorDataReceived, AddressOf LogReceived

'初始化时钟
RunInNewThread(
Sub()
Try
Do Until State = MinecraftState.Ended OrElse State = MinecraftState.Crashed OrElse State = MinecraftState.Canceled OrElse Loader.State = LoadState.Aborted
TimerWindow()
TimerLog()
TimerStack()
'设置窗口标题
For i = 1 To 3
If IsWindowFinished AndAlso IsWindowAppeared AndAlso WindowTitle <> "" AndAlso State = MinecraftState.Running AndAlso Not GameProcess.HasExited Then
Expand Down Expand Up @@ -131,6 +133,34 @@
Canceled
End Enum

Private _IsStackInRecord As Boolean = False
Private ExportedStackInfo As String = ""
'栈记录
Private Sub TimerStack()
If (Not String.IsNullOrWhiteSpace(Me.JSatckPath)) Then
If (Not GameProcess.Responding) AndAlso (Not _IsStackInRecord) Then
_IsStackInRecord = True
RunInNewThread(Sub()
Try
Dim output = ShellAndGetOutput(JSatckPath, GameProcess.Id)
If output.Length < 64 Then Exit Sub '访问可能被拒绝了
Dim path = Version.Path & "PCL\JStackRecord\"
Directory.CreateDirectory(path)
Dim fileName = path & "jstack_" & Guid.NewGuid().ToString() & ".log"
File.WriteAllText(fileName, output)
If File.Exists(ExportedStackInfo) Then File.Delete(ExportedStackInfo)
ExportedStackInfo = fileName
Catch ex As Exception
Log(ex, "[Watcher] 导出 JStack 信息失败……")
End Try
End Sub, "GameStack Export")
End If
If GameProcess.Responding Then
_IsStackInRecord = False
End If
End If
End Sub

'日志
Public WaitingLog As New List(Of String)(1000)
Private ReadOnly WaitingLogLock As New Object
Expand Down Expand Up @@ -359,8 +389,10 @@
Analyzer.Collect(Version.PathIndie, LatestLog.ToList)
Analyzer.Prepare()
Analyzer.Analyze(Version)
Analyzer.Output(False, New List(Of String) From
{Version.Path & Version.Name & ".json", Path & "PCL\Log1.txt", Path & "PCL\LatestLaunch.bat"})
Dim output As New List(Of String) From
{Version.Path & Version.Name & ".json", Path & "PCL\Log1.txt", Path & "PCL\LatestLaunch.bat"}
If Not String.IsNullOrWhiteSpace(ExportedStackInfo) Then output.Add(ExportedStackInfo)
Analyzer.Output(False, output)
Catch ex As Exception
Log(ex, "崩溃分析失败", LogLevel.Feedback)
End Try
Expand Down