Skip to content

Commit 8d39553

Browse files
committed
memcache: rename Mutex name to conventional 'mu' name
Signed-off-by: Brad Fitzpatrick <[email protected]>
1 parent 4536b83 commit 8d39553

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

memcache/memcache.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ type Client struct {
155155

156156
selector ServerSelector
157157

158-
lk sync.Mutex
158+
mu sync.Mutex
159159
freeconn map[string][]*conn
160160
}
161161

@@ -213,8 +213,8 @@ func (cn *conn) condRelease(err *error) {
213213
}
214214

215215
func (c *Client) putFreeConn(addr net.Addr, cn *conn) {
216-
c.lk.Lock()
217-
defer c.lk.Unlock()
216+
c.mu.Lock()
217+
defer c.mu.Unlock()
218218
if c.freeconn == nil {
219219
c.freeconn = make(map[string][]*conn)
220220
}
@@ -227,8 +227,8 @@ func (c *Client) putFreeConn(addr net.Addr, cn *conn) {
227227
}
228228

229229
func (c *Client) getFreeConn(addr net.Addr) (cn *conn, ok bool) {
230-
c.lk.Lock()
231-
defer c.lk.Unlock()
230+
c.mu.Lock()
231+
defer c.mu.Unlock()
232232
if c.freeconn == nil {
233233
return nil, false
234234
}
@@ -476,11 +476,11 @@ func (c *Client) touchFromAddr(addr net.Addr, keys []string, expiration int32) e
476476
// cache misses. Each key must be at most 250 bytes in length.
477477
// If no error is returned, the returned map will also be non-nil.
478478
func (c *Client) GetMulti(keys []string) (map[string]*Item, error) {
479-
var lk sync.Mutex
479+
var mu sync.Mutex
480480
m := make(map[string]*Item)
481481
addItemToMap := func(it *Item) {
482-
lk.Lock()
483-
defer lk.Unlock()
482+
mu.Lock()
483+
defer mu.Unlock()
484484
m[it.Key] = it
485485
}
486486

@@ -834,8 +834,8 @@ func (c *Client) incrDecr(verb, key string, delta uint64) (uint64, error) {
834834
//
835835
// After Close, the Client may still be used.
836836
func (c *Client) Close() error {
837-
c.lk.Lock()
838-
defer c.lk.Unlock()
837+
c.mu.Lock()
838+
defer c.mu.Unlock()
839839
var ret error
840840
for _, conns := range c.freeconn {
841841
for _, c := range conns {

0 commit comments

Comments
 (0)