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

service/api: Expose WaitSince and WaitReason fields for goroutines (#2264)

Browse Source 
This adds the WaitSince and WaitReason fields for the goroutines to allow the users to easily understand why a goroutine is waiting.
This commit is contained in:
Florin Pățan 2020-12-14 19:31:45 +02:00 committed by GitHub
parent d481eabab9
commit 7ac317a7e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/proc/variables.go
View File

@ -201,6 +201,9 @@ type G struct {
stkbarPos int // stkbarPos field of g struct stkbarPos int // stkbarPos field of g struct
stack stack // value of stack stack stack // value of stack
WaitSince int64
WaitReason int64
SystemStack bool // SystemStack is true if this goroutine is currently executing on a system stack. SystemStack bool // SystemStack is true if this goroutine is currently executing on a system stack.
// Information on goroutine location // Information on goroutine location
@ -846,6 +849,8 @@ func (v *Variable) parseG() (*G, error) {
id := loadInt64Maybe("goid") id := loadInt64Maybe("goid")
gopc := loadInt64Maybe("gopc") gopc := loadInt64Maybe("gopc")
startpc := loadInt64Maybe("startpc") startpc := loadInt64Maybe("startpc")
waitSince := loadInt64Maybe("waitsince")
waitReason := loadInt64Maybe("waitreason")
var stackhi, stacklo uint64 var stackhi, stacklo uint64
if stackVar := v.loadFieldNamed("stack"); stackVar != nil { if stackVar := v.loadFieldNamed("stack"); stackVar != nil {
if stackhiVar := stackVar.fieldVariable("hi"); stackhiVar != nil { if stackhiVar := stackVar.fieldVariable("hi"); stackhiVar != nil {
@ -882,6 +887,8 @@ func (v *Variable) parseG() (*G, error) {
BP: uint64(bp), BP: uint64(bp),
LR: uint64(lr), LR: uint64(lr),
Status: uint64(status), Status: uint64(status),
WaitSince: waitSince,
WaitReason: waitReason,
CurrentLoc: Location{PC: uint64(pc), File: f, Line: l, Fn: fn}, CurrentLoc: Location{PC: uint64(pc), File: f, Line: l, Fn: fn},
variable: v, variable: v,
stkbarVar: stkbarVar, stkbarVar: stkbarVar,

2
service/api/conversions.go
View File

@ -295,6 +295,8 @@ func ConvertGoroutine(g *proc.G) *Goroutine {
GoStatementLoc: ConvertLocation(g.Go()), GoStatementLoc: ConvertLocation(g.Go()),
StartLoc: ConvertLocation(g.StartLoc()), StartLoc: ConvertLocation(g.StartLoc()),
ThreadID: tid, ThreadID: tid,
WaitSince: g.WaitSince,
WaitReason: g.WaitReason,
Labels: g.Labels(), Labels: g.Labels(),
} }
} }

2
service/api/types.go
View File

@ -314,6 +314,8 @@ type Goroutine struct {
StartLoc Location `json:"startLoc"` StartLoc Location `json:"startLoc"`
// ID of the associated thread for running goroutines // ID of the associated thread for running goroutines
ThreadID int `json:"threadID"` ThreadID int `json:"threadID"`
WaitSince int64 `json:"waitSince"`
WaitReason int64 `json:"waitReason"`
Unreadable string `json:"unreadable"` Unreadable string `json:"unreadable"`
// Goroutine's pprof labels // Goroutine's pprof labels
Labels map[string]string `json:"labels,omitempty"` Labels map[string]string `json:"labels,omitempty"`