Merge lp:~dave-cheney/goose/001-move-gccgo-specific-code-to-individual into lp:goose

[Dave Cheney]

Split out implementation specific behaviour

Use conditional compilation rather than switching on runtime.Compiler. When the upstream bugs are resolved, we can remove these hacks.

Split out implementation specific behaviour

Use conditional compilation rather than switching on runtime.Compiler. When the upstream bugs are resolved, we can remove these hacks.

https://codereview.appspot.com/32550043/

[Andrew Wilkins (axwalk)]

On 2013/11/26 01:32:05, dfc wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/32550043/

[Go Bot (go-bot)]

The prerequisite https://code.launchpad.net/~dave-cheney/goose/goose has not yet been merged into https://code.launchpad.net/~go-bot/goose/trunk.

=== modified file 'testservices/hook/service.go'
--- testservices/hook/service.go	2013-11-25 20:32:40 +0000
+++ testservices/hook/service.go	2013-11-26 01:31:50 +0000
@@ -1,10 +1,5 @@
 package hook
 
-import (
-	"runtime"
-	"strings"
-)
-
 type TestService struct {
 	ServiceControl
 	// Hooks to run when specified control points are reached in the service business logic.
@@ -27,47 +22,6 @@
 	RegisterControlPoint(name string, controller ControlProcessor) ControlHookCleanup
 }
 
-// currentServiceMethodName returns the method executing on the service when ProcessControlHook was invoked.
-func (s *TestService) currentServiceMethodName() string {
-	var pc uintptr
-	var ok bool
-
-	// We have to go deeper into the stack with gccgo because in a situation like:
-	// type Inner { }
-	// func (i *Inner) meth {}
-	// type Outer { Inner }
-	// o = &Outer{}
-	// o.meth()
-	// gccgo generates a method called "meth" on *Outer, and this shows up
-	// on the stack as seen by runtime.Caller (this might be a gccgo bug).
-
-	if runtime.Compiler == "gccgo" {
-		pc, _, _, ok = runtime.Caller(3)
-	} else {
-		pc, _, _, ok = runtime.Caller(2)
-	}
-	if !ok {
-		panic("current method name cannot be found")
-	}
-	return unqualifiedMethodName(pc)
-}
-
-func unqualifiedMethodName(pc uintptr) string {
-	f := runtime.FuncForPC(pc)
-	fullName := f.Name()
-	if runtime.Compiler == "gccgo" {
-		// 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...
-		nameParts := strings.Split(fullName, ".")
-		return nameParts[2]
-	} else {
-		nameParts := strings.Split(fullName, ".")
-		return nameParts[len(nameParts)-1]
-	}
-}
-
 // ProcessControlHook retrieves the ControlProcessor for the specified hook name and runs it, returning any error.
 // Use it like this to invoke a hook registered for some arbitrary control point:
 // if err := n.ProcessControlHook("foobar", <serviceinstance>, <somearg1>, <somearg2>); err != nil {

=== added file 'testservices/hook/service_gc.go'
--- testservices/hook/service_gc.go	1970-01-01 00:00:00 +0000
+++ testservices/hook/service_gc.go	2013-11-26 01:31:50 +0000
@@ -0,0 +1,24 @@
+// +build !gccgo
+
+package hook
+
+import (
+	"runtime"
+	"strings"
+)
+
+// currentServiceMethodName returns the method executing on the service when ProcessControlHook was invoked.
+func (s *TestService) currentServiceMethodName() string {
+	pc, _, _, ok := runtime.Caller(2)
+	if !ok {
+		panic("current method name cannot be found")
+	}
+	return unqualifiedMethodName(pc)
+}
+
+func unqualifiedMethodName(pc uintptr) string {
+	f := runtime.FuncForPC(pc)
+	fullName := f.Name()
+	nameParts := strings.Split(fullName, ".")
+	return nameParts[len(nameParts)-1]
+}

=== added file 'testservices/hook/service_gccgo.go'
--- testservices/hook/service_gccgo.go	1970-01-01 00:00:00 +0000
+++ testservices/hook/service_gccgo.go	2013-11-26 01:31:50 +0000
@@ -0,0 +1,37 @@
+// +build gccgo
+
+package hook
+
+import (
+	"runtime"
+	"strings"
+)
+
+// currentServiceMethodName returns the method executing on the service when ProcessControlHook was invoked.
+func (s *TestService) currentServiceMethodName() string {
+	// We have to go deeper into the stack with gccgo because in a situation like:
+	// type Inner { }
+	// func (i *Inner) meth {}
+	// type Outer { Inner }
+	// o = &Outer{}
+	// o.meth()
+	// gccgo generates a method called "meth" on *Outer, and this shows up
+	// on the stack as seen by runtime.Caller (this might be a gccgo bug).
+
+	pc, _, _, ok := runtime.Caller(3)
+	if !ok {
+		panic("current method name cannot be found")
+	}
+	return unqualifiedMethodName(pc)
+}
+
+func unqualifiedMethodName(pc uintptr) string {
+	f := runtime.FuncForPC(pc)
+	fullName := f.Name()
+	// 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...
+	nameParts := strings.Split(fullName, ".")
+	return nameParts[2]
+}