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

debugger: always detach in debugger

Browse Source 
GdbserverProcess does its cleanup in Detach we need to always call
that function.
This commit is contained in:
aarzilli 2017-03-27 10:37:07 +02:00 committed by Derek Parker
parent 1a0df69cbf
commit 905d3d9962
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
service/debugger/debugger.go
View File

@ -163,10 +163,10 @@ func (d *Debugger) Detach(kill bool) error {
}
func (d *Debugger) detach(kill bool) error {
if d.config.AttachPid != 0 {
return d.target.Detach(kill)
if d.config.AttachPid == 0 {
kill = true
}
return d.target.Kill()
return d.target.Detach(kill)
}
// Restart will restart the target process, first killing
@ -187,9 +187,9 @@ func (d *Debugger) Restart() ([]api.DiscardedBreakpoint, error) {
if err := stopProcess(d.ProcessPid()); err != nil {
return nil, err
}
if err := d.detach(true); err != nil {
return nil, err
}
}
if err := d.detach(true); err != nil {
return nil, err
}
p, err := d.Launch(d.config.ProcessArgs, d.config.WorkingDir)
if err != nil {
@ -215,9 +215,8 @@ func (d *Debugger) Restart() ([]api.DiscardedBreakpoint, error) {
return nil, err
}
}
err = d.target.Detach(true)
d.target = p
return discarded, err
return discarded, nil
}
// State returns the current state of the debugger.