Allow 2 simultaneous (compact-)block downloads #10984
Closed
Conversation
This file contains hidden or 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
6a66609 to
cad4b16
Compare
|
Rebased and added a simple test |
|
Rebased. |
cad4b16 to
458feb3
Compare
|
Nice work! |
458feb3 to
ea17977
Compare
|
Rebased. |
promag
reviewed
Jan 10, 2018
| range.first++; | ||
| if (itInFlight->second.first == nodeid) { | ||
| if (clearState) ClearDownloadState(itInFlight); | ||
| mmapBlocksInFlight.erase(itInFlight); |
There was a problem hiding this comment.
Loose itInFlight:
while (range.first != range.second) {
if (range.first->second.first == nodeid) {
if (clearState) ClearDownloadState(range.first);
range.first = mmapBlocksInFlight.erase(range.first);
} else {
range.first++;
}
}There was a problem hiding this comment.
Heh, thats more lines (and IMO less readable)...
src/net_processing.cpp
Outdated
| LOCK(cs_main); | ||
| bool found = false; | ||
| std::pair<BlockDownloadMap::iterator, BlockDownloadMap::iterator> range = mmapBlocksInFlight.equal_range(hash); | ||
| while (range.first != range.second) { |
There was a problem hiding this comment.
Loose found:
if (range.first == range.second) return false;
while (range.first != range.second) {
...
}
return true;
src/net_processing.cpp
Outdated
| *pit = &itInFlight->second.second; | ||
| std::pair<BlockDownloadMap::iterator, BlockDownloadMap::iterator> range = mmapBlocksInFlight.equal_range(hash); | ||
| while (range.first != range.second) { | ||
| BlockDownloadMap::iterator itInFlight = range.first; |
This pushes some "is this callback useful" logic down into net_processing, which is useful for later changes as it allows for more notifications to be used.
The received block could be malleated, so this is both simpler, and supports parallel downloads.
…ight This is a change in behavior so that if for some reason we request a block from a peer, we don't allow an unsolicited CMPCT_BLOCK announcement for that same block to cause a request for a full block from the uninvited peer (as some type of request is already outstanding from the original peer)
...as long as the second one uses compact blocks with no more than 10 missing transactions
ea17977 to
8acd39a
Compare
The sentence above is controversial to itself.! EDIT: (not applicable)! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is a (somewhat) simpler version of #9447 based on #10652.
It allows for up to 2 simultaneous downloads of the same block at once, as long as the second one is using compact blocks and only has up to 10 transactions to request in a getblocktxn (if applicable).