mirror of
https://github.com/sourcegraph/jsonrpc2.git
synced 2026-06-16 04:04:56 +02:00
conn: do not lock sending when closing (#70)
The sending mutex may be blocked due to the underlying conn blocking. If that happens then we can't call close since close also attempts to hold the sending mutex. Sending mutex is only used for serializing sends and doesn't protect the fields close reads/writes. I believe we introduced locking it so we would return ErrClosed. This commit instead introduces a check in send which rechecks if we have since closed while attempting to send. Test Plan: expanded the test coverage
This commit is contained in:
parent
040dc22f8a
commit
5d80b29f44
2 changed files with 81 additions and 33 deletions
13
conn.go
13
conn.go
|
|
@ -166,9 +166,7 @@ func (c *Conn) SendResponse(ctx context.Context, resp *Response) error {
|
|||
}
|
||||
|
||||
func (c *Conn) close(cause error) error {
|
||||
c.sending.Lock()
|
||||
c.mu.Lock()
|
||||
defer c.sending.Unlock()
|
||||
defer c.mu.Unlock()
|
||||
|
||||
if c.closed {
|
||||
|
|
@ -249,6 +247,17 @@ func (c *Conn) send(_ context.Context, m *anyMessage, wait bool) (cc *call, err
|
|||
c.sending.Lock()
|
||||
defer c.sending.Unlock()
|
||||
|
||||
// double check the error isn't due to being closed while sending.
|
||||
defer func() {
|
||||
if err != nil {
|
||||
c.mu.Lock()
|
||||
if c.closed {
|
||||
err = ErrClosed
|
||||
}
|
||||
c.mu.Unlock()
|
||||
}
|
||||
}()
|
||||
|
||||
// m.request.ID could be changed, so we store a copy to correctly
|
||||
// clean up pending
|
||||
var id ID
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue