Skip to content

Avoid double finalize and racing setting err #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrick merged 2 commits into from
Jan 2, 2025
Merged

Avoid double finalize and racing setting err #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70f361d
Avoid double finalize and racing setting err
jrick Jan 2, 2025
7a86b28
Panic from finalize() if double finalization is detected
jrick Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ type call struct {
}

func (c *call) finalize() {
if atomic.CompareAndSwapUint32(&c.finalized, 0, 1) {
c.done <- c
if !atomic.CompareAndSwapUint32(&c.finalized, 0, 1) {
panic("wsrpc: double call finalization")
}
c.done <- c
}

func (c *call) Result() (interface{}, error) {
Expand Down Expand Up @@ -498,12 +499,14 @@ func (c *Client) Go(ctx context.Context, method string, result interface{}, done
err = c.err
}
if err != nil {
// This may be called concurrently with out() -> setErr(), so
// finalize the error under the client mutex to prevent double
// finalization.
c.callMu.Lock()
delete(c.calls, id)
c.callMu.Unlock()
// call was not sent, safe to set and finalize error
call.err = err
call.finalize()
c.callMu.Unlock()
}
return call
}
Expand Down