Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-22 19:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

SideChain: tweaked m_seenBlocks cleanup logic

Browse source
This commit is contained in:
SChernykh 2023-05-22 15:30:57 +02:00
parent dbb4efb98a
commit eab8a51bb7
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/side_chain.cpp
View file

@ -490,6 +490,28 @@ void SideChain::unsee_block(const PoolBlock& block)
m_seenBlocks.erase(block.get_full_id());
}
size_t SideChain::cleanup_seen_blocks()
{
size_t n = 0;
MutexLock lock(m_seenBlocksLock);
// Forget seen blocks that weren't added for any reason
hash h;
for (auto i = m_seenBlocks.begin(); i != m_seenBlocks.end();) {
memcpy(h.h, i->data(), HASH_SIZE);
if (m_blocksById.count(h) == 0) {
i = m_seenBlocks.erase(i);
++n;
}
else {
++i;
}
}
return n;
}
bool SideChain::add_external_block(PoolBlock& block, std::vector<hash>& missing_blocks)
{
if (block.m_difficulty < m_minDifficulty) {
@ -2003,7 +2025,6 @@ void SideChain::prune_old_blocks()
auto it2 = m_blocksById.find(block->m_sidechainId);
if (it2 != m_blocksById.end()) {
m_blocksById.erase(it2);
unsee_block(*block);
delete block;
++num_blocks_pruned;
}
@ -2035,6 +2056,11 @@ void SideChain::prune_old_blocks()
// Pre-calc workers are not needed anymore
finish_precalc();
const size_t n = cleanup_seen_blocks();
if (n > 0) {
LOGINFO(5, "pruned " << n << " seen blocks");
}
#ifdef DEV_TEST_SYNC
if (m_pool && m_precalcFinished.load() && (cur_time >= m_synchronizedTime + 120)) {
LOGINFO(0, log::LightGreen() << "[DEV] Synchronization finished successfully, stopping P2Pool now");

2
src/side_chain.h
View file

@ -48,6 +48,8 @@ public:
bool block_seen(const PoolBlock& block);
void unsee_block(const PoolBlock& block);
size_t cleanup_seen_blocks();
bool add_external_block(PoolBlock& block, std::vector<hash>& missing_blocks);
bool add_block(const PoolBlock& block);
void get_missing_blocks(std::vector<hash>& missing_blocks) const;