Skip to content

Conversation

@UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Mar 25, 2020

No description provided.

…face queue

97d2b09 Add helper to wait for validation interface queue to catch up (Matt Corallo)
3613749 Block ActivateBestChain to empty validationinterface queue (Matt Corallo)
5a933ce Add an interface to get the queue depth out of CValidationInterface (Matt Corallo)
a99b76f Require no cs_main lock for ProcessNewBlock/ActivateBestChain (Matt Corallo)
a734896 Avoid cs_main in net_processing ActivateBestChain calls (Matt Corallo)
66aa1d5 Refactor ProcessGetData in anticipation of avoiding cs_main for ABC (Matt Corallo)
818075a Create new mutex for orphans, no cs_main in PLV::BlockConnected (Matt Corallo)

Pull request description:

  This should fix bitcoin#11822.

  It ended up bigger than I hoped for, but its not too gnarly. Note that "
  Require no cs_main lock for ProcessNewBlock/ActivateBestChain" is mostly pure code-movement.

Tree-SHA512: 1127688545926f6099449dca6a4e6609eefc3abbd72f1c66e03d32bd8c7b31e82097d8307822cfd1dec0321703579cfdd82069cab6e17b1024e75eac694122cb
@UdjinM6 UdjinM6 added this to the 16 milestone Mar 25, 2020
@codablock
Copy link

codablock commented Mar 25, 2020

Just a few minor things that got lost: 65ddd34
Most white space stuff or ordering of locks which were fixed by you in the past. The ordering is not really more correct in the bitcoin version, but this way we reduce conflicts in the future.

@UdjinM6
Copy link
Author

UdjinM6 commented Mar 25, 2020

@codablock Whitespace changes are kind of unrelated (but I'm fine with fixing it here). cs_main changes however revert a fix we backported earlier, should not be applied IMO. pls see #3300 (comment)

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

@codablock
Copy link

@UdjinM6 Ah I see, I thought these were fixes pre-11824.

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@codablock
Copy link

fyi, test failure is unrelated and fixed in #3378

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