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

dlv: Flag to print stacktrace on trace subcommand

Browse Source
This commit is contained in:
Derek Parker
2016-01-27 23:47:04 -08:00
committed by aarzilli
parent 62870df140
commit 8a1f36a1ce
2 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cmd/dlv/main.go
View File

@ -10,7 +10,6 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"strconv" "strconv"
"strings"
"syscall" "syscall"
"github.com/derekparker/delve/config" "github.com/derekparker/delve/config"
@ -137,7 +136,7 @@ starts and attaches to it, and enables you to immediately begin debugging your p
rootCommand.AddCommand(execCommand) rootCommand.AddCommand(execCommand)
// 'trace' subcommand. // 'trace' subcommand.
var traceAttachPid int var traceAttachPid, traceStackDepth int
traceCommand := &cobra.Command{ traceCommand := &cobra.Command{
Use: "trace [regexp]", Use: "trace [regexp]",
Short: "Compile and begin tracing program.", Short: "Compile and begin tracing program.",
@ -193,50 +192,26 @@ starts and attaches to it, and enables you to immediately begin debugging your p
return 1 return 1
} }
for i := range funcs { for i := range funcs {
_, err := client.CreateBreakpoint(&api.Breakpoint{FunctionName: funcs[i], Line: -1, Tracepoint: true}) _, err := client.CreateBreakpoint(&api.Breakpoint{FunctionName: funcs[i], Line: -1, Tracepoint: true, Stacktrace: traceStackDepth})
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
return 1 return 1
} }
} }
stateChan := client.Continue() cmds := terminal.DebugCommands(client)
for { cmd := cmds.Find("continue")
select { err = cmd(terminal.New(client, nil), "")
case state := <-stateChan: if err != nil {
if state == nil { fmt.Fprintln(os.Stderr, err)
return 0
}
if state.Err != nil {
fmt.Fprintln(os.Stderr, state.Err)
return 0
}
for i := range state.Threads {
th := state.Threads[i]
if th.Breakpoint == nil {
continue
}
var args []string
var fname string
if th.Function != nil {
fname = th.Function.Name
}
if th.BreakpointInfo != nil {
for _, arg := range th.BreakpointInfo.Arguments {
args = append(args, arg.SinglelineString())
}
}
fmt.Printf("%s(%s) %s:%d\n", fname, strings.Join(args, ", "), terminal.ShortenFilePath(th.File), th.Line)
}
case <-sigChan:
server.Stop(traceAttachPid == 0)
return 1 return 1
} }
} return 0
}() }()
os.Exit(status) os.Exit(status)
}, },
} }
traceCommand.Flags().IntVarP(&traceAttachPid, "pid", "p", 0, "Pid to attach to.") traceCommand.Flags().IntVarP(&traceAttachPid, "pid", "p", 0, "Pid to attach to.")
traceCommand.Flags().IntVarP(&traceStackDepth, "stack", "s", 0, "Show stack trace with given depth.")
rootCommand.AddCommand(traceCommand) rootCommand.AddCommand(traceCommand)
// 'test' subcommand. // 'test' subcommand.

7
terminal/command.go
View File

@ -826,6 +826,9 @@ func digits(n int) int {
} }
func printStack(stack []api.Stackframe, ind string) { func printStack(stack []api.Stackframe, ind string) {
if len(stack) == 0 {
return
}
d := digits(len(stack) - 1) d := digits(len(stack) - 1)
fmtstr := "%s%" + strconv.Itoa(d) + "d 0x%016x in %s\n" fmtstr := "%s%" + strconv.Itoa(d) + "d 0x%016x in %s\n"
s := strings.Repeat(" ", d+2+len(ind)) s := strings.Repeat(" ", d+2+len(ind))
@ -884,9 +887,9 @@ func printcontextThread(t *Term, th *api.Thread) {
} }
args := "" args := ""
if th.Breakpoint.Tracepoint && fn != nil { if th.Breakpoint.Tracepoint {
var arg []string var arg []string
for _, ar := range fn.Args { for _, ar := range th.BreakpointInfo.Arguments {
arg = append(arg, ar.SinglelineString()) arg = append(arg, ar.SinglelineString())
} }
args = strings.Join(arg, ", ") args = strings.Join(arg, ", ")