Merge lp:~dave-cheney/goose/100-more-gccgo-fixes into lp:goose

[Dave Cheney]

testservices/hook: fix gccgo build failure

Try to make the detection of the location in the raw stack trace where the method name is mentioned smarter.

Fixes build errors on ppc

https://codereview.appspot.com/141720043/

testservices/hook: fix gccgo build failure

Try to make the detection of the location in the raw stack trace where the method name is mentioned smarter.

Fixes build errors on ppc

https://codereview.appspot.com/141720043/

[Dave Cheney (dave-cheney)]

Reviewers: mp+233669_code.launchpad.net,

Message:
Please take a look.

Description:
testservices/hook: fix gccgo build failure

Try to make the detection of the location in the raw stack trace where
the method name is mentioned smarter.

Fixes build errors on ppc

https://code.launchpad.net/~dave-cheney/goose/100-more-gccgo-fixes/+merge/233669

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/141720043/

Affected files (+12, -2 lines):
   A [revision details]
   M testservices/hook/service_gccgo.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140702055133-xpuj6gm4pa0f3a0e
+New revision: <email address hidden>

Index: testservices/hook/service_gccgo.go
=== modified file 'testservices/hook/service_gccgo.go'
--- testservices/hook/service_gccgo.go 2014-02-06 00:42:49 +0000
+++ testservices/hook/service_gccgo.go 2014-09-08 06:57:41 +0000
@@ -12,6 +12,9 @@
  // versions.
  var callerDepth int

+// namePartsPos defines the position within the raw method name,
deliniated by periods.
+var namePartsPos = -1 // will panic if we cannot determine the position.
+
  type inner struct{}

  func (i *inner) m() {
@@ -21,6 +24,12 @@
     panic("current method name cannot be found")
    }
    if name := runtime.FuncForPC(pc).Name(); name == "hook.setCallerDepth" {
+ for i, s := range strings.Split(name, ".") {
+ if s == "setCallerDepth" {
+ namePartsPos = i
+ break
+ }
+ }
     return
    }
   }
@@ -67,8 +76,7 @@
   // This is very fragile. fullName will be something like:
   //
launchpad.net_goose_testservices_novaservice.removeServer.pN49_launchpad.net_goose_testservices_novaservice.Nova
   // so if the number of dots in the full package path changes,
- // this will need to too...
- const namePartsPos = 2
+ // We try to figure sniff this value at the top, but it may not work.
   nameParts := strings.Split(fullName, ".")
   return nameParts[namePartsPos]
  }

[Dave Cheney (dave-cheney)]

Please take a look.

https://codereview.appspot.com/141720043/

[Dave Cheney (dave-cheney)]

Please take a look.

https://codereview.appspot.com/141720043/

=== modified file 'testservices/hook/service_gccgo.go'
--- testservices/hook/service_gccgo.go	2014-02-06 00:42:49 +0000
+++ testservices/hook/service_gccgo.go	2014-09-08 06:59:26 +0000
@@ -12,6 +12,9 @@
 // versions.
 var callerDepth int
 
+// namePartsPos defines the position within the raw method name, deliniated by periods.
+var namePartsPos = -1 // will panic if we cannot determine the position.
+
 type inner struct{}
 
 func (i *inner) m() {
@@ -21,6 +24,12 @@
 			panic("current method name cannot be found")
 		}
 		if name := runtime.FuncForPC(pc).Name(); name == "hook.setCallerDepth" {
+			for i, s := range strings.Split(name, ".") {
+				if s == "setCallerDepth" {
+					namePartsPos = i
+					break
+				}
+			}
 			return
 		}
 	}
@@ -67,8 +76,7 @@
 	// This is very fragile.  fullName will be something like:
 	// launchpad.net_goose_testservices_novaservice.removeServer.pN49_launchpad.net_goose_testservices_novaservice.Nova
 	// so if the number of dots in the full package path changes,
-	// this will need to too...
-	const namePartsPos = 2
+	// We try to figure sniff this value at the top, but it may not work.
 	nameParts := strings.Split(fullName, ".")
 	return nameParts[namePartsPos]
 }