github/ttrpc
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First process the pending messages in recv channel

Browse Source 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
This commit is contained in:
Iceber Gu 2023-05-09 11:40:38 +08:00
parent 0ca69a9ca2
commit c51165f20d
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client.go
View File

@ -483,14 +483,22 @@ func (c *Client) dispatch(ctx context.Context, req *Request, resp *Response) err
} }
defer c.deleteStream(s) defer c.deleteStream(s)
var msg *streamMessage
select { select {
case <-ctx.Done(): case <-ctx.Done():
return ctx.Err() return ctx.Err()
case <-c.ctx.Done(): case <-c.ctx.Done():
return ErrClosed return ErrClosed
case <-s.recvClose: case <-s.recvClose:
// If recv has a pending message, process that first
select {
case msg = <-s.recv:
default:
return s.recvErr return s.recvErr
case msg := <-s.recv: }
case msg = <-s.recv:
}
if msg.header.Type == messageTypeResponse { if msg.header.Type == messageTypeResponse {
err = proto.Unmarshal(msg.payload[:msg.header.Length], resp) err = proto.Unmarshal(msg.payload[:msg.header.Length], resp)
} else { } else {
@ -501,5 +509,4 @@ func (c *Client) dispatch(ctx context.Context, req *Request, resp *Response) err
c.channel.putmbuf(msg.payload) c.channel.putmbuf(msg.payload)
return err return err
}
} }