1
=== modified file 'testservices/hook/service.go'
2
--- testservices/hook/service.go	2013-11-25 20:32:40 +0000
3
+++ testservices/hook/service.go	2013-11-26 01:31:50 +0000
4
@@ -1,10 +1,5 @@
5
1
package hook
1
package hook
6
2
2
7
3
import (
8
4
	"runtime"
9
5
	"strings"
10
6
)
11
7
12
8
type TestService struct {
3
type TestService struct {
13
9
	ServiceControl
4
	ServiceControl
14
10
	// Hooks to run when specified control points are reached in the service business logic.
5
	// Hooks to run when specified control points are reached in the service business logic.
15
@@ -27,47 +22,6 @@
16
27
	RegisterControlPoint(name string, controller ControlProcessor) ControlHookCleanup
22
	RegisterControlPoint(name string, controller ControlProcessor) ControlHookCleanup
17
28
}
23
}
18
29
24
19
30
// currentServiceMethodName returns the method executing on the service when ProcessControlHook was invoked.
20
31
func (s *TestService) currentServiceMethodName() string {
21
32
	var pc uintptr
22
33
	var ok bool
23
34
24
35
	// We have to go deeper into the stack with gccgo because in a situation like:
25
36
	// type Inner { }
26
37
	// func (i *Inner) meth {}
27
38
	// type Outer { Inner }
28
39
	// o = &Outer{}
29
40
	// o.meth()
30
41
	// gccgo generates a method called "meth" on *Outer, and this shows up
31
42
	// on the stack as seen by runtime.Caller (this might be a gccgo bug).
32
43
33
44
	if runtime.Compiler == "gccgo" {
34
45
		pc, _, _, ok = runtime.Caller(3)
35
46
	} else {
36
47
		pc, _, _, ok = runtime.Caller(2)
37
48
	}
38
49
	if !ok {
39
50
		panic("current method name cannot be found")
40
51
	}
41
52
	return unqualifiedMethodName(pc)
42
53
}
43
54
44
55
func unqualifiedMethodName(pc uintptr) string {
45
56
	f := runtime.FuncForPC(pc)
46
57
	fullName := f.Name()
47
58
	if runtime.Compiler == "gccgo" {
48
59
		// This is very fragile.  fullName will be something like:
49
60
		// launchpad.net_goose_testservices_novaservice.removeServer.pN49_launchpad.net_goose_testservices_novaservice.Nova
50
61
		// so if the number of dots in the full package path changes,
51
62
		// this will need to too...
52
63
		nameParts := strings.Split(fullName, ".")
53
64
		return nameParts[2]
54
65
	} else {
55
66
		nameParts := strings.Split(fullName, ".")
56
67
		return nameParts[len(nameParts)-1]
57
68
	}
58
69
}
59
70
60
71
// ProcessControlHook retrieves the ControlProcessor for the specified hook name and runs it, returning any error.
25
// ProcessControlHook retrieves the ControlProcessor for the specified hook name and runs it, returning any error.
61
72
// Use it like this to invoke a hook registered for some arbitrary control point:
26
// Use it like this to invoke a hook registered for some arbitrary control point:
62
73
// if err := n.ProcessControlHook("foobar", <serviceinstance>, <somearg1>, <somearg2>); err != nil {
27
// if err := n.ProcessControlHook("foobar", <serviceinstance>, <somearg1>, <somearg2>); err != nil {
63
74
28
64
=== added file 'testservices/hook/service_gc.go'
65
--- testservices/hook/service_gc.go	1970-01-01 00:00:00 +0000
66
+++ testservices/hook/service_gc.go	2013-11-26 01:31:50 +0000
67
@@ -0,0 +1,24 @@
68
1
// +build !gccgo
69
2
70
3
package hook
71
4
72
5
import (
73
6
	"runtime"
74
7
	"strings"
75
8
)
76
9
77
10
// currentServiceMethodName returns the method executing on the service when ProcessControlHook was invoked.
78
11
func (s *TestService) currentServiceMethodName() string {
79
12
	pc, _, _, ok := runtime.Caller(2)
80
13
	if !ok {
81
14
		panic("current method name cannot be found")
82
15
	}
83
16
	return unqualifiedMethodName(pc)
84
17
}
85
18
86
19
func unqualifiedMethodName(pc uintptr) string {
87
20
	f := runtime.FuncForPC(pc)
88
21
	fullName := f.Name()
89
22
	nameParts := strings.Split(fullName, ".")
90
23
	return nameParts[len(nameParts)-1]
91
24
}
92
0
25
93
=== added file 'testservices/hook/service_gccgo.go'
94
--- testservices/hook/service_gccgo.go	1970-01-01 00:00:00 +0000
95
+++ testservices/hook/service_gccgo.go	2013-11-26 01:31:50 +0000
96
@@ -0,0 +1,37 @@
97
1
// +build gccgo
98
2
99
3
package hook
100
4
101
5
import (
102
6
	"runtime"
103
7
	"strings"
104
8
)
105
9
106
10
// currentServiceMethodName returns the method executing on the service when ProcessControlHook was invoked.
107
11
func (s *TestService) currentServiceMethodName() string {
108
12
	// We have to go deeper into the stack with gccgo because in a situation like:
109
13
	// type Inner { }
110
14
	// func (i *Inner) meth {}
111
15
	// type Outer { Inner }
112
16
	// o = &Outer{}
113
17
	// o.meth()
114
18
	// gccgo generates a method called "meth" on *Outer, and this shows up
115
19
	// on the stack as seen by runtime.Caller (this might be a gccgo bug).
116
20
117
21
	pc, _, _, ok := runtime.Caller(3)
118
22
	if !ok {
119
23
		panic("current method name cannot be found")
120
24
	}
121
25
	return unqualifiedMethodName(pc)
122
26
}
123
27
124
28
func unqualifiedMethodName(pc uintptr) string {
125
29
	f := runtime.FuncForPC(pc)
126
30
	fullName := f.Name()
127
31
	// This is very fragile.  fullName will be something like:
128
32
	// launchpad.net_goose_testservices_novaservice.removeServer.pN49_launchpad.net_goose_testservices_novaservice.Nova
129
33
	// so if the number of dots in the full package path changes,
130
34
	// this will need to too...
131
35
	nameParts := strings.Split(fullName, ".")
132
36
	return nameParts[2]
133
37
}
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-11-26	Pending
Review via email: mp+196643@code.launchpad.net