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

service/debugger: support function spec. with partial package paths

Browse Source 
packagename.SomeFunction should match
github.com/someuser/packagename.SomeFunction since the former is
the familiar syntax.
To disambiguate between io.SomeFunction and
github.com/someuser/somepackage/io.SomeFunction specify one extra
slash at the start of the location specifier: /io.SomeFunction.

Fixes Issue #296
This commit is contained in:
aarzilli 2015-12-12 15:01:35 +01:00
parent e45443b3c4
commit b5cf1572f8
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
service/debugger/locations.go
View File

@ -40,6 +40,7 @@ type LineLocationSpec struct {
type FuncLocationSpec struct { type FuncLocationSpec struct {
PackageName string PackageName string
AbsolutePackage bool
ReceiverName string ReceiverName string
PackageOrReceiverName string PackageOrReceiverName string
BaseName string BaseName string
@ -176,12 +177,17 @@ func parseFuncLocationSpec(in string) *FuncLocationSpec {
case 3: case 3:
spec.BaseName = v[2] spec.BaseName = v[2]
spec.ReceiverName = stripReceiverDecoration(v[1]) spec.ReceiverName = stripReceiverDecoration(v[1])
spec.PackageName = stripReceiverDecoration(v[0]) spec.PackageName = v[0]
default: default:
return nil return nil
} }
if strings.HasPrefix(spec.PackageName, "/") {
spec.PackageName = spec.PackageName[1:]
spec.AbsolutePackage = true
}
if strings.Index(spec.BaseName, "/") >= 0 || strings.Index(spec.ReceiverName, "/") >= 0 { if strings.Index(spec.BaseName, "/") >= 0 || strings.Index(spec.ReceiverName, "/") >= 0 {
return nil return nil
} }
@ -209,10 +215,18 @@ func (spec *FuncLocationSpec) Match(sym *gosym.Sym) bool {
if spec.ReceiverName != "" && spec.ReceiverName != recv { if spec.ReceiverName != "" && spec.ReceiverName != recv {
return false return false
} }
if spec.PackageName != "" && spec.PackageName != sym.PackageName() { if spec.PackageName != "" {
return false if spec.AbsolutePackage {
if spec.PackageName != sym.PackageName() {
return false
}
} else {
if !partialPathMatch(spec.PackageName, sym.PackageName()) {
return false
}
}
} }
if spec.PackageOrReceiverName != "" && spec.PackageOrReceiverName != sym.PackageName() && spec.PackageOrReceiverName != recv { if spec.PackageOrReceiverName != "" && !partialPathMatch(spec.PackageOrReceiverName, sym.PackageName()) && spec.PackageOrReceiverName != recv {
return false return false
} }
return true return true
@ -239,10 +253,14 @@ func (loc *AddrLocationSpec) Find(d *Debugger, pc uint64, locStr string) ([]api.
} }
func (loc *NormalLocationSpec) FileMatch(path string) bool { func (loc *NormalLocationSpec) FileMatch(path string) bool {
if len(loc.Base) < len(path)-1 { return partialPathMatch(loc.Base, path)
return strings.HasSuffix(path, loc.Base) && (path[len(path)-len(loc.Base)-1] == filepath.Separator) }
func partialPathMatch(expr, path string) bool {
if len(expr) < len(path)-1 {
return strings.HasSuffix(path, expr) && (path[len(path)-len(expr)-1] == filepath.Separator)
} else { } else {
return loc.Base == path return expr == path
} }
} }

6
service/test/integration_test.go
View File

@ -573,7 +573,11 @@ func TestClientServer_FindLocations(t *testing.T) {
findLocationHelper(t, c, "main.(*SomeType).String", false, 1, someTypeStringFuncAddr) findLocationHelper(t, c, "main.(*SomeType).String", false, 1, someTypeStringFuncAddr)
// Issue #275 // Issue #275
findLocationHelper(t, c, "io/ioutil.ReadFile", false, 1, 0) readfile := findLocationHelper(t, c, "io/ioutil.ReadFile", false, 1, 0)[0]
// Issue #296
findLocationHelper(t, c, "/io/ioutil.ReadFile", false, 1, readfile)
findLocationHelper(t, c, "ioutil.ReadFile", false, 1, readfile)
stringAddrs := findLocationHelper(t, c, "/^main.*Type.*String$/", false, 2, 0) stringAddrs := findLocationHelper(t, c, "/^main.*Type.*String$/", false, 2, 0)