golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-29 01:27:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Inline superfluous function definition

Browse Source
This commit is contained in:
Derek Parker
2015-07-10 14:48:45 -05:00
parent aa71d787aa
commit 99cf3abc18
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
proc/proc.go
View File

@ -375,38 +375,36 @@ func (dbp *Process) Continue() error {
return fmt.Errorf("could not continue thread %d %s", thread.Id, err)
}
}
return dbp.run(dbp.resume)
}
func (dbp *Process) resume() error {
thread, err := dbp.trapWait(-1)
if err != nil {
return err
}
if err := dbp.Halt(); err != nil {
return err
}
if dbp.CurrentThread != thread {
dbp.SwitchThread(thread.Id)
}
pc, err := thread.PC()
if err != nil {
return err
}
if dbp.CurrentBreakpoint() != nil || dbp.halt {
return dbp.Halt()
}
// Check to see if we hit a runtime.breakpoint
fn := dbp.goSymTable.PCToFunc(pc)
if fn != nil && fn.Name == "runtime.breakpoint" {
// step twice to get back to user code
for i := 0; i < 2; i++ {
if err = thread.Step(); err != nil {
return err
return dbp.run(func() error {
thread, err := dbp.trapWait(-1)
if err != nil {
return err
}
if err := dbp.Halt(); err != nil {
return err
}
if dbp.CurrentThread != thread {
dbp.SwitchThread(thread.Id)
}
pc, err := thread.PC()
if err != nil {
return err
}
if dbp.CurrentBreakpoint() != nil || dbp.halt {
return dbp.Halt()
}
// Check to see if we hit a runtime.breakpoint
fn := dbp.goSymTable.PCToFunc(pc)
if fn != nil && fn.Name == "runtime.breakpoint" {
// step twice to get back to user code
for i := 0; i < 2; i++ {
if err = thread.Step(); err != nil {
return err
}
}
}
}
return nil
return nil
})
}
// Single step, will execute a single instruction.