Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-16 13:10:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

blockstorage: Add height_last to PruneLockInfo

Browse Source
This commit is contained in:
Luke Dashjr 2022-03-21 15:36:22 +00:00
parent 64de1480d3
commit 1ebacb60f8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/node/blockstorage.cpp
View File

@ -31,6 +31,7 @@
#include <util/batchpriority.h> #include <util/batchpriority.h>
#include <util/check.h> #include <util/check.h>
#include <util/fs.h> #include <util/fs.h>
#include <util/overflow.h>
#include <util/signalinterrupt.h> #include <util/signalinterrupt.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/translation.h> #include <util/translation.h>
@ -283,10 +284,13 @@ bool BlockManager::DoPruneLocksForbidPruning(const CBlockFileInfo& block_file_in
if (prune_lock.second.height_first == std::numeric_limits<int>::max()) continue; if (prune_lock.second.height_first == std::numeric_limits<int>::max()) continue;
// Remove the buffer and one additional block here to get actual height that is outside of the buffer // Remove the buffer and one additional block here to get actual height that is outside of the buffer
const unsigned int lock_height{(unsigned)std::max(1, prune_lock.second.height_first - PRUNE_LOCK_BUFFER - 1)}; const unsigned int lock_height{(unsigned)std::max(1, prune_lock.second.height_first - PRUNE_LOCK_BUFFER - 1)};
if (block_file_info.nHeightLast > lock_height) { const unsigned int lock_height_last{(unsigned)std::max(1, SaturatingAdd(prune_lock.second.height_last, PRUNE_LOCK_BUFFER))};
LogPrint(BCLog::PRUNE, "%s limited pruning to height %d\n", prune_lock.first, lock_height); if (block_file_info.nHeightFirst > lock_height_last) continue;
return true; if (block_file_info.nHeightLast <= lock_height) continue;
} // TODO: Check each block within the file against the prune_lock range
LogPrint(BCLog::PRUNE, "%s limited pruning to height %d\n", prune_lock.first, lock_height);
return true;
} }
return false; return false;
} }

6
src/node/blockstorage.h
View File

@ -93,6 +93,7 @@ struct CBlockIndexHeightOnlyComparator {
struct PruneLockInfo { struct PruneLockInfo {
int height_first{std::numeric_limits<int>::max()}; //! Height of earliest block that should be kept and not pruned int height_first{std::numeric_limits<int>::max()}; //! Height of earliest block that should be kept and not pruned
int height_last{std::numeric_limits<int>::max()}; //! Height of latest block that should be kept and not pruned
}; };
enum BlockfileType { enum BlockfileType {
@ -253,8 +254,9 @@ private:
/** /**
* Map from external index name to oldest block that must not be pruned. * Map from external index name to oldest block that must not be pruned.
* *
* @note Internally, only blocks at height (height_first - PRUNE_LOCK_BUFFER - 1) and * @note Internally, only blocks before height (height_first - PRUNE_LOCK_BUFFER - 1) and
* below will be pruned, but callers should avoid assuming any particular buffer size. * after height (height_last + PRUNE_LOCK_BUFFER) will be pruned, but callers should
* avoid assuming any particular buffer size.
*/ */
std::unordered_map<std::string, PruneLockInfo> m_prune_locks GUARDED_BY(::cs_main); std::unordered_map<std::string, PruneLockInfo> m_prune_locks GUARDED_BY(::cs_main);