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

net/rpc: fix mutex comment

Browse Source 
Fixes #8086.

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://golang.org/cl/153420044
This commit is contained in:
Rob Pike 2014-10-13 10:27:51 -07:00
parent 3cf9acccae
commit 968153d063
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/net/rpc/client.go
View File

@ -41,10 +41,10 @@ type Call struct {
type Client struct {
codec ClientCodec
sending sync.Mutex
reqMutex sync.Mutex // protects following
request Request
mutex sync.Mutex // protects following
request Request
seq uint64
pending map[uint64]*Call
closing bool // user has called Close
@ -69,8 +69,8 @@ type ClientCodec interface {
}
func (client *Client) send(call *Call) {
client.sending.Lock()
defer client.sending.Unlock()
client.reqMutex.Lock()
defer client.reqMutex.Unlock()
// Register this call.
client.mutex.Lock()
@ -146,7 +146,7 @@ func (client *Client) input() {
}
}
// Terminate pending calls.
client.sending.Lock()
client.reqMutex.Lock()
client.mutex.Lock()
client.shutdown = true
closing := client.closing
@ -162,7 +162,7 @@ func (client *Client) input() {
call.done()
}
client.mutex.Unlock()
client.sending.Unlock()
client.reqMutex.Unlock()
if debugLog && err != io.EOF && !closing {
log.Println("rpc: client protocol error:", err)
}