-
Notifications
You must be signed in to change notification settings - Fork 1.2k
backport: bitcoin#20942 (Move some net_processing globals into PeerManagerImpl) #5365
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.
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
Conversation
|
This pull request has conflicts, please rebase. |
|
Marking as ready so hopefully CI runs..? |
|
CI just doesn't want to run here... @kittywhiskers can you open a new pr from this commit? thanks |
|
"removing assignee" + "rebasing" + "dropping the branch in gitlalb repo" + "webhook redelivery" helped it seems. easy 😅 |
knst
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The difference that I noticed between this PR and original bitcoin's changes.
All mentioned points are checked and valid, just a notice for history/re-review if needed.
Checked and correct as expected - just moved to header:
ProcessGetData- missingEXCLUSIVE_LOCKS_REQUIRED(!cs_main)PeerManagerImpl::MarkBlockAsReceived- missingEXCLUSIVE_LOCKS_REQUIRED(cs_main)PeerManagerImpl::MarkBlockAsInFlight- missingEXCLUSIVE_LOCKS_REQUIRED(cs_main)PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs- missingEXCLUSIVE_LOCKS_REQUIRED(cs_main)PeerManagerImpl::TipMayBeStale- missingEXCLUSIVE_LOCKS_REQUIRED(cs_main)PeerManagerImpl::FindNextBlocksToDownload- missingEXCLUSIVE_LOCKS_REQUIRED(cs_main)
Checked and correct as expected - it's not changed line in this PR (both bitcoin and our):
m_connman.ForNode(nodeid, [this](CNode* pfrom)- - missingEXCLUSIVE_LOCKS_REQUIRED(::cs_main)BUT ASSERT forcs_main
Checked and correct as expected - it's appliable only for wtx
- missing
LOCK(cs_main);before "ignoring duplicate wtxidrelay from peer=%d\n", pfrom.GetId())"
|
I mean, redundant annotations were eventually removed with bitcoin#21188 and it is clear that its presence is more a liability than anything. I removed it because my understanding is that the annotations need to be present in the declaration and having to change the annotation in the definition as well, while debugging, made it a bit of drag. So I opted to remove to as a matter of convenience. The removal in the bitcoin PR can be backported once its preceding contents are also backported but it's also done via a |
UdjinM6
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, ok, makes sense. utACK
PastaPastaPasta
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK for merging via merge commit;
all checks passing
Split off due to TSan failures and depends on #5352