Skip to content

Commit af68af3

Browse files
committed
remove ServerMessageChanLock
1 parent 296d31f commit af68af3

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

โ€Žclient/client.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ type Client struct {
115115

116116
Plugins PluginContainer
117117

118-
ServerMessageChanMu sync.RWMutex
119-
ServerMessageChan chan<- *protocol.Message
118+
ServerMessageChan chan<- *protocol.Message
120119
}
121120

122121
// NewClient returns a new Client with the option.
@@ -200,16 +199,12 @@ func (call *Call) done() {
200199

201200
// RegisterServerMessageChan registers the channel that receives server requests.
202201
func (client *Client) RegisterServerMessageChan(ch chan<- *protocol.Message) {
203-
client.ServerMessageChanMu.Lock()
204202
client.ServerMessageChan = ch
205-
client.ServerMessageChanMu.Unlock()
206203
}
207204

208205
// UnregisterServerMessageChan removes ServerMessageChan.
209206
func (client *Client) UnregisterServerMessageChan() {
210-
client.ServerMessageChanMu.Lock()
211207
client.ServerMessageChan = nil
212-
client.ServerMessageChanMu.Unlock()
213208
}
214209

215210
// IsClosing client is closing or not.
@@ -666,11 +661,9 @@ func (client *Client) input() {
666661
switch {
667662
case call == nil:
668663
if isServerMessage {
669-
client.ServerMessageChanMu.RLock()
670664
if client.ServerMessageChan != nil {
671665
client.handleServerRequest(res)
672666
}
673-
client.ServerMessageChanMu.RUnlock()
674667
continue
675668
}
676669
case res.MessageStatusType() == protocol.Error:
@@ -718,9 +711,7 @@ func (client *Client) input() {
718711
}
719712
// Terminate pending calls.
720713

721-
client.ServerMessageChanMu.RLock()
722714
if client.ServerMessageChan != nil {
723-
client.ServerMessageChanMu.RUnlock()
724715
req := protocol.NewMessage()
725716
req.SetMessageType(protocol.Request)
726717
req.SetMessageStatusType(protocol.Error)

0 commit comments

Comments
ย (0)