Skip to content

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented May 10, 2023

Split off due to TSan failures and depends on #5352

@github-actions
Copy link

This pull request has conflicts, please rebase.

@PastaPastaPasta PastaPastaPasta marked this pull request as ready for review May 15, 2023 12:55
@PastaPastaPasta
Copy link
Member

Marking as ready so hopefully CI runs..?

@PastaPastaPasta
Copy link
Member

CI just doesn't want to run here... @kittywhiskers can you open a new pr from this commit? thanks

@UdjinM6
Copy link

UdjinM6 commented May 16, 2023

"removing assignee" + "rebasing" + "dropping the branch in gitlalb repo" + "webhook redelivery" helped it seems. easy 😅

Copy link
Collaborator

@knst knst left a 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 - missing EXCLUSIVE_LOCKS_REQUIRED(!cs_main)
  • PeerManagerImpl::MarkBlockAsReceived - missing EXCLUSIVE_LOCKS_REQUIRED(cs_main)
  • PeerManagerImpl::MarkBlockAsInFlight - missing EXCLUSIVE_LOCKS_REQUIRED(cs_main)
  • PeerManagerImpl::MaybeSetPeerAsAnnouncingHeaderAndIDs - missing EXCLUSIVE_LOCKS_REQUIRED(cs_main)
  • PeerManagerImpl::TipMayBeStale - missing EXCLUSIVE_LOCKS_REQUIRED(cs_main)
  • PeerManagerImpl::FindNextBlocksToDownload - missing EXCLUSIVE_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) - - missing EXCLUSIVE_LOCKS_REQUIRED(::cs_main) BUT ASSERT for cs_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())"

@UdjinM6
Copy link

UdjinM6 commented May 18, 2023

these unrelated changes (some mentioned by @knst) must be reverted cd087fc imo

@kwvg
Copy link
Collaborator Author

kwvg commented May 18, 2023

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 scripted-diff so nothing is lost in terms of ease-of-backporting if it is OOO.

@kwvg kwvg requested review from PastaPastaPasta and UdjinM6 May 18, 2023 14:04
Copy link

@UdjinM6 UdjinM6 left a 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

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a 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

@PastaPastaPasta PastaPastaPasta merged commit f6f2d6b into dashpay:develop May 18, 2023
@UdjinM6 UdjinM6 added this to the 20 milestone May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants