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

pkg/terminal: Add function name to return tracepoints (#3712)

Browse Source
This commit is contained in:
Archana Ravindar 2024-04-24 02:52:17 +05:30 committed by GitHub
parent baf68e0e79
commit 8c07c984e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/dlv/dlv_test.go
View File

@ -896,7 +896,7 @@ func TestDAPCmdWithClient(t *testing.T) {
func TestTrace(t *testing.T) { func TestTrace(t *testing.T) {
dlvbin := getDlvBin(t) dlvbin := getDlvBin(t)
expected := []byte("> goroutine(1): main.foo(99, 9801)\n>> goroutine(1): => (9900)\n") expected := []byte("> goroutine(1): main.foo(99, 9801)\n>> goroutine(1): main.foo => (9900)\n")
fixtures := protest.FindFixturesDir() fixtures := protest.FindFixturesDir()
cmd := exec.Command(dlvbin, "trace", "--output", filepath.Join(t.TempDir(), "__debug"), filepath.Join(fixtures, "issue573.go"), "foo") cmd := exec.Command(dlvbin, "trace", "--output", filepath.Join(t.TempDir(), "__debug"), filepath.Join(fixtures, "issue573.go"), "foo")
@ -920,7 +920,7 @@ func TestTrace(t *testing.T) {
func TestTrace2(t *testing.T) { func TestTrace2(t *testing.T) {
dlvbin := getDlvBin(t) dlvbin := getDlvBin(t)
expected := []byte("> goroutine(1): main.callme(2)\n>> goroutine(1): => (4)\n") expected := []byte("> goroutine(1): main.callme(2)\n>> goroutine(1): main.callme => (4)\n")
fixtures := protest.FindFixturesDir() fixtures := protest.FindFixturesDir()
cmd := exec.Command(dlvbin, "trace", "--output", filepath.Join(t.TempDir(), "__debug"), filepath.Join(fixtures, "traceprog.go"), "callme") cmd := exec.Command(dlvbin, "trace", "--output", filepath.Join(t.TempDir(), "__debug"), filepath.Join(fixtures, "traceprog.go"), "callme")
@ -948,7 +948,7 @@ func TestTraceMultipleGoroutines(t *testing.T) {
// I think a future improvement could be to use regexp captures to match the // I think a future improvement could be to use regexp captures to match the
// goroutine IDs at function entry and exit. // goroutine IDs at function entry and exit.
expected := []byte("main.callme(0, \"five\")\n") expected := []byte("main.callme(0, \"five\")\n")
expected2 := []byte("=> (0)\n") expected2 := []byte("main.callme => (0)\n")
fixtures := protest.FindFixturesDir() fixtures := protest.FindFixturesDir()
cmd := exec.Command(dlvbin, "trace", "--output", filepath.Join(t.TempDir(), "__debug"), filepath.Join(fixtures, "goroutines-trace.go"), "callme") cmd := exec.Command(dlvbin, "trace", "--output", filepath.Join(t.TempDir(), "__debug"), filepath.Join(fixtures, "goroutines-trace.go"), "callme")
@ -983,7 +983,7 @@ func TestTracePid(t *testing.T) {
dlvbin := getDlvBin(t) dlvbin := getDlvBin(t)
expected := []byte("goroutine(1): main.A()\n>> goroutine(1): => ()\n") expected := []byte("goroutine(1): main.A()\n>> goroutine(1): main.A => ()\n")
// make process run // make process run
fix := protest.BuildFixture("issue2023", 0) fix := protest.BuildFixture("issue2023", 0)

2
pkg/terminal/command.go
View File

@ -2930,7 +2930,7 @@ func printTracepoint(t *Term, th *api.Thread, bpname string, fn *api.Function, a
for _, v := range th.ReturnValues { for _, v := range th.ReturnValues {
retVals = append(retVals, v.SinglelineString()) retVals = append(retVals, v.SinglelineString())
} }
fmt.Fprintf(t.stdout, ">> goroutine(%d): => (%s)\n", th.GoroutineID, strings.Join(retVals, ",")) fmt.Fprintf(t.stdout, ">> goroutine(%d): %s => (%s)\n", th.GoroutineID, fn.Name(), strings.Join(retVals, ","))
} }
if th.Breakpoint.TraceReturn || !hasReturnValue { if th.Breakpoint.TraceReturn || !hasReturnValue {
if th.BreakpointInfo != nil && th.BreakpointInfo.Stacktrace != nil { if th.BreakpointInfo != nil && th.BreakpointInfo.Stacktrace != nil {