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

*: switch to int64 for goroutine IDs (#3110)

Browse Source 
Go 1.20 switched to uint64 to represent goroutine IDs, we can't
actually follow suit because we have allowed clients to use -1 to refer
to the currently selected goroutine, however we should at least switch
to int64 and also update the rtype check to accept the 1.20 type.
This commit is contained in:
Alessandro Arzilli
2022-08-16 18:31:11 +02:00
committed by GitHub
parent 0c09fc9bdd
commit 5b9f65dac2
19 changed files with 122 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/proc/variables.go
View File

@ -196,7 +196,7 @@ const (
// G represents a runtime G (goroutine) structure (at least the
// fields that Delve is interested in).
type G struct {
ID int // Goroutine ID
ID int64 // Goroutine ID
PC uint64 // PC of goroutine when it was parked.
SP uint64 // SP of goroutine when it was parked.
BP uint64 // BP of goroutine when it was parked (go >= 1.7).
@ -312,7 +312,7 @@ func GoroutinesInfo(dbp *Target, start, count int) ([]*G, int, error) {
}
var (
threadg = map[int]*G{}
threadg = map[int64]*G{}
allg []*G
)
@ -367,7 +367,7 @@ func GoroutinesInfo(dbp *Target, start, count int) ([]*G, int, error) {
// FindGoroutine returns a G struct representing the goroutine
// specified by `gid`.
func FindGoroutine(dbp *Target, gid int) (*G, error) {
func FindGoroutine(dbp *Target, gid int64) (*G, error) {
if selg := dbp.SelectedGoroutine(); (gid == -1) || (selg != nil && selg.ID == gid) || (selg == nil && gid == 0) {
// Return the currently selected goroutine in the following circumstances:
//
@ -886,7 +886,17 @@ func (v *Variable) parseG() (*G, error) {
return n
}
id := loadInt64Maybe("goid") // +rtype int64
loadUint64Maybe := func(name string) uint64 {
vv := v.loadFieldNamed(name)
if vv == nil {
unreadable = true
return 0
}
n, _ := constant.Uint64Val(vv.Value)
return n
}
id := loadUint64Maybe("goid") // +rtype int64|uint64
gopc := loadInt64Maybe("gopc") // +rtype uintptr
startpc := loadInt64Maybe("startpc") // +rtype uintptr
waitSince := loadInt64Maybe("waitsince") // +rtype int64
@ -919,7 +929,7 @@ func (v *Variable) parseG() (*G, error) {
v.Name = "runtime.curg"
g := &G{
ID: int(id),
ID: int64(id),
GoPC: uint64(gopc),
StartPC: uint64(startpc),
PC: uint64(pc),