Rebased and added a simple test
Rebased.
Nice work! Obviously concept ACK (have not looked closely at the code yet).
291 | + while (range.first != range.second) { 292 | + BlockDownloadMap::iterator itInFlight = range.first; 293 | + range.first++; 294 | + if (itInFlight->second.first == nodeid) { 295 | + if (clearState) ClearDownloadState(itInFlight); 296 | + mmapBlocksInFlight.erase(itInFlight);
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++;
}
}
Heh, thats more lines (and IMO less readable)...
322 | - } 323 | - return false; 324 | + LOCK(cs_main); 325 | + bool found = false; 326 | + std::pair<BlockDownloadMap::iterator, BlockDownloadMap::iterator> range = mmapBlocksInFlight.equal_range(hash); 327 | + while (range.first != range.second) {
Loose found:
if (range.first == range.second) return false;
while (range.first != range.second) {
...
}
return true;
Done.
345 | - if (itInFlight != mapBlocksInFlight.end() && itInFlight->second.first == nodeid) { 346 | - if (pit) { 347 | - *pit = &itInFlight->second.second; 348 | + std::pair<BlockDownloadMap::iterator, BlockDownloadMap::iterator> range = mmapBlocksInFlight.equal_range(hash); 349 | + while (range.first != range.second) { 350 | + BlockDownloadMap::iterator itInFlight = range.first;
Same as above.
Done.
Rebased.
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.
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
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).
The sentence above is controversial to itself.!
EDIT: (not applicable)!