PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service: print better message for unattended stops (#3747)

Browse Source 
Print a better message when an unattended stop happens for reasons
other than hitting a breakpoint.
This commit is contained in:
Alessandro Arzilli 2024-06-19 18:57:41 +02:00 committed by GitHub
parent 4b628b81cb
commit d673e04662
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
service/debugger/debugger.go
View File

@ -1340,7 +1340,7 @@ func (d *Debugger) Command(command *api.DebuggerCommand, resumeNotify chan struc
d.amendBreakpoint(bp) d.amendBreakpoint(bp)
} }
d.maybePrintUnattendedBreakpointWarning(state.CurrentThread, clientStatusCh) d.maybePrintUnattendedBreakpointWarning(d.target.Selected.StopReason, state.CurrentThread, clientStatusCh)
return state, err return state, err
} }
@ -1531,7 +1531,7 @@ func traverse(t proc.ValidTargets, f *proc.Function, depth int, followCalls int)
for _, instr := range text { for _, instr := range text {
if instr.IsCall() && instr.DestLoc != nil && instr.DestLoc.Fn != nil { if instr.IsCall() && instr.DestLoc != nil && instr.DestLoc.Fn != nil {
cf := instr.DestLoc.Fn cf := instr.DestLoc.Fn
if ((strings.HasPrefix(cf.Name, "runtime.") || strings.HasPrefix(cf.Name, "runtime/internal")) && cf.Name != "runtime.deferreturn" && cf.Name != "runtime.gorecover" && cf.Name != "runtime.gopanic") { if (strings.HasPrefix(cf.Name, "runtime.") || strings.HasPrefix(cf.Name, "runtime/internal")) && cf.Name != "runtime.deferreturn" && cf.Name != "runtime.gorecover" && cf.Name != "runtime.gopanic" {
continue continue
} }
childnode := TraceMap[cf.Name] childnode := TraceMap[cf.Name]
@ -2504,7 +2504,7 @@ func attachErrorMessageDefault(pid int, err error) error {
return fmt.Errorf("could not attach to pid %d: %s", pid, err) return fmt.Errorf("could not attach to pid %d: %s", pid, err)
} }
func (d *Debugger) maybePrintUnattendedBreakpointWarning(currentThread *api.Thread, clientStatusCh <-chan struct{}) { func (d *Debugger) maybePrintUnattendedBreakpointWarning(stopReason proc.StopReason, currentThread *api.Thread, clientStatusCh <-chan struct{}) {
select { select {
case <-clientStatusCh: case <-clientStatusCh:
// the channel will be closed if the client that sends the command has left // the channel will be closed if the client that sends the command has left
@ -2528,8 +2528,14 @@ func (d *Debugger) maybePrintUnattendedBreakpointWarning(currentThread *api.Thre
bp := currentThread.Breakpoint bp := currentThread.Breakpoint
if bp == nil { if bp == nil {
fmt.Fprintln(os.Stderr, "bp", bp) switch stopReason {
return case proc.StopManual:
// print nothing
return
default:
fmt.Fprintln(os.Stderr, "Stop reason: "+stopReason.String())
return
}
} }
switch bp.Name { switch bp.Name {