mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: use srcFunc for showframe 

Since srcFunc can represent information for either an real text
function or an inlined function, this means we no longer have to
synthesize a fake _func just to call showframe on an inlined frame.

This is cleaner and also eliminates the one case where _func values
live in the heap. This will let us mark them NotInHeap, which will in
turn eliminate pesky write barriers in the traceback rewrite.

For #54466.

Change-Id: Ibf5e24d01ee4bf384c825e1a4e2922ef444a438e
Reviewed-on: https://go-review.googlesource.com/c/go/+/466097
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Michael Pratt <mpratt@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Austin Clements 2023-02-05 22:02:03 -05:00
parent f52bede354
commit d829b62681
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/runtime/traceback.go
View File

@ -376,22 +376,16 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in
// If there is inlining info, print the inner frames. // If there is inlining info, print the inner frames.
if inldata := funcdata(f, _FUNCDATA_InlTree); inldata != nil { if inldata := funcdata(f, _FUNCDATA_InlTree); inldata != nil {
inltree := (*[1 << 20]inlinedCall)(inldata) inltree := (*[1 << 20]inlinedCall)(inldata)
var inlFunc _func
inlFuncInfo := funcInfo{&inlFunc, f.datap}
for { for {
ix := pcdatavalue(f, _PCDATA_InlTreeIndex, tracepc, nil) ix := pcdatavalue(f, _PCDATA_InlTreeIndex, tracepc, nil)
if ix < 0 { if ix < 0 {
break break
} }
// Create a fake _func for the sf := srcFunc{f.datap, inltree[ix].nameOff, inltree[ix].startLine, inltree[ix].funcID}
// inlined function.
inlFunc.nameOff = inltree[ix].nameOff
inlFunc.funcID = inltree[ix].funcID
inlFunc.startLine = inltree[ix].startLine
if (flags&_TraceRuntimeFrames) != 0 || showframe(inlFuncInfo, gp, nprint == 0, inlFuncInfo.funcID, calleeFuncID) { if (flags&_TraceRuntimeFrames) != 0 || showframe(sf, gp, nprint == 0, calleeFuncID) {
name := funcname(inlFuncInfo) name := sf.name()
file, line := funcline(f, tracepc) file, line := funcline(f, tracepc)
print(name, "(...)\n") print(name, "(...)\n")
print("\t", file, ":", line, "\n") print("\t", file, ":", line, "\n")
@ -402,7 +396,7 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in
tracepc = frame.fn.entry() + uintptr(inltree[ix].parentPc) tracepc = frame.fn.entry() + uintptr(inltree[ix].parentPc)
} }
} }
if (flags&_TraceRuntimeFrames) != 0 || showframe(f, gp, nprint == 0, f.funcID, calleeFuncID) { if (flags&_TraceRuntimeFrames) != 0 || showframe(f.srcFunc(), gp, nprint == 0, calleeFuncID) {
// Print during crash. // Print during crash.
// main(0x1, 0x2, 0x3) // main(0x1, 0x2, 0x3)
// /home/rsc/go/src/runtime/x.go:23 +0xf // /home/rsc/go/src/runtime/x.go:23 +0xf
@ -692,7 +686,7 @@ func printcreatedby(gp *g) {
// Show what created goroutine, except main goroutine (goid 1). // Show what created goroutine, except main goroutine (goid 1).
pc := gp.gopc pc := gp.gopc
f := findfunc(pc) f := findfunc(pc)
if f.valid() && showframe(f, gp, false, funcID_normal, funcID_normal) && gp.goid != 1 { if f.valid() && showframe(f.srcFunc(), gp, false, funcID_normal) && gp.goid != 1 {
printcreatedby1(f, pc, gp.parentGoid) printcreatedby1(f, pc, gp.parentGoid)
} }
} }
@ -792,7 +786,7 @@ func printAncestorTraceback(ancestor ancestorInfo) {
print("[originating from goroutine ", ancestor.goid, "]:\n") print("[originating from goroutine ", ancestor.goid, "]:\n")
for fidx, pc := range ancestor.pcs { for fidx, pc := range ancestor.pcs {
f := findfunc(pc) // f previously validated f := findfunc(pc) // f previously validated
if showfuncinfo(f, fidx == 0, funcID_normal, funcID_normal) { if showfuncinfo(f.srcFunc(), fidx == 0, funcID_normal) {
printAncestorTracebackFuncInfo(f, pc) printAncestorTracebackFuncInfo(f, pc)
} }
} }
@ -801,7 +795,7 @@ func printAncestorTraceback(ancestor ancestorInfo) {
} }
// Show what created goroutine, except main goroutine (goid 1). // Show what created goroutine, except main goroutine (goid 1).
f := findfunc(ancestor.gopc) f := findfunc(ancestor.gopc)
if f.valid() && showfuncinfo(f, false, funcID_normal, funcID_normal) && ancestor.goid != 1 { if f.valid() && showfuncinfo(f.srcFunc(), false, funcID_normal) && ancestor.goid != 1 {
// In ancestor mode, we'll already print the goroutine ancestor. // In ancestor mode, we'll already print the goroutine ancestor.
// Pass 0 for the goid parameter so we don't print it again. // Pass 0 for the goid parameter so we don't print it again.
printcreatedby1(f, ancestor.gopc, 0) printcreatedby1(f, ancestor.gopc, 0)
@ -850,35 +844,28 @@ func gcallers(gp *g, skip int, pcbuf []uintptr) int {
// showframe reports whether the frame with the given characteristics should // showframe reports whether the frame with the given characteristics should
// be printed during a traceback. // be printed during a traceback.
func showframe(f funcInfo, gp *g, firstFrame bool, funcID, childID funcID) bool { func showframe(sf srcFunc, gp *g, firstFrame bool, calleeID funcID) bool {
mp := getg().m mp := getg().m
if mp.throwing >= throwTypeRuntime && gp != nil && (gp == mp.curg || gp == mp.caughtsig.ptr()) { if mp.throwing >= throwTypeRuntime && gp != nil && (gp == mp.curg || gp == mp.caughtsig.ptr()) {
return true return true
} }
return showfuncinfo(f, firstFrame, funcID, childID) return showfuncinfo(sf, firstFrame, calleeID)
} }
// showfuncinfo reports whether a function with the given characteristics should // showfuncinfo reports whether a function with the given characteristics should
// be printed during a traceback. // be printed during a traceback.
func showfuncinfo(f funcInfo, firstFrame bool, funcID, childID funcID) bool { func showfuncinfo(sf srcFunc, firstFrame bool, calleeID funcID) bool {
// Note that f may be a synthesized funcInfo for an inlined
// function, in which case only nameOff and funcID are set.
level, _, _ := gotraceback() level, _, _ := gotraceback()
if level > 1 { if level > 1 {
// Show all frames. // Show all frames.
return true return true
} }
if !f.valid() { if sf.funcID == funcID_wrapper && elideWrapperCalling(calleeID) {
return false return false
} }
if funcID == funcID_wrapper && elideWrapperCalling(childID) { name := sf.name()
return false
}
name := funcname(f)
// Special case: always show runtime.gopanic frame // Special case: always show runtime.gopanic frame
// in the middle of a stack trace, so that we can // in the middle of a stack trace, so that we can