fix: avoid hSocket double lock
#5939
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It's is locked in `CloseSocketDisconnect()` already.
| @@ -4237,7 +4237,7 @@ void CConnman::UnregisterEvents(CNode *pnode) | |||
| { | |||
| #ifdef USE_KQUEUE | |||
| if (socketEventsMode == SOCKETEVENTS_KQUEUE) { | |||
| LOCK(pnode->cs_hSocket); | |||
| AssertLockHeld(pnode->cs_hSocket); | |||
There was a problem hiding this comment.
Shouldn't we add EXCLUSIVE_LOCKS_REQURIED in header?
There was a problem hiding this comment.
We can't do this cause we lock cs_hSocket per node and UnregisterEvents() is a member of CConnman, not CNode
PastaPastaPasta
closed this pull request by merging all changes
into
dashpay:develop
in
26e886a
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
It's is locked in
CloseSocketDisconnect()already.To be merged before #5511 or 19915 backport is going to cause issues otherwise.
What was done?
Assert the lock is held already, instead of locking it again.
How Has This Been Tested?
Run tests, run a node on testnet and drop connections to peers
Breaking Changes
n/a
Checklist: