qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 00:04:41 -07:00
Code Releases Activity

rpc: make Server.Mutex unexported

Browse Source 
Currently it's possible to write:
var s rpc.Server
...
// reuse for my own purposes
s.Lock()
...
s.Unlock()
which is seemingly not intended.

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/4888049
This commit is contained in:
Dmitriy Vyukov 2011-08-16 18:34:56 +10:00 committed by Andrew Gerrand
parent 381f6a2eeb
commit 53573c02b8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/rpc/debug.go
View File

@ -70,7 +70,7 @@ func (server debugHTTP) ServeHTTP(w http.ResponseWriter, req *http.Request) {
// Build a sorted version of the data.
var services = make(serviceArray, len(server.serviceMap))
i := 0
server.Lock()
server.mu.Lock()
for sname, service := range server.serviceMap {
services[i] = debugService{service, sname, make(methodArray, len(service.method))}
j := 0
@ -81,7 +81,7 @@ func (server debugHTTP) ServeHTTP(w http.ResponseWriter, req *http.Request) {
sort.Sort(services[i].Method)
i++
}
server.Unlock()
server.mu.Unlock()
sort.Sort(services)
err := debug.Execute(w, services)
if err != nil {

10
src/pkg/rpc/server.go
View File

@ -174,7 +174,7 @@ type Response struct {
// Server represents an RPC Server.
type Server struct {
sync.Mutex // protects the serviceMap
mu sync.Mutex // protects the serviceMap
serviceMap map[string]*service
reqLock sync.Mutex // protects freeReq
freeReq *Request
@ -226,8 +226,8 @@ func (server *Server) RegisterName(name string, rcvr interface{}) os.Error {
}
func (server *Server) register(rcvr interface{}, name string, useName bool) os.Error {
server.Lock()
defer server.Unlock()
server.mu.Lock()
defer server.mu.Unlock()
if server.serviceMap == nil {
server.serviceMap = make(map[string]*service)
}
@ -524,9 +524,9 @@ func (server *Server) readRequestHeader(codec ServerCodec) (service *service, mt
return
}
// Look up the request.
server.Lock()
server.mu.Lock()
service = server.serviceMap[serviceMethod[0]]
server.Unlock()
server.mu.Unlock()
if service == nil {
err = os.NewError("rpc: can't find service " + req.ServiceMethod)
return