mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-31 02:31:07 +00:00
refactor: rename will_reuse_cache to reallocate_cache
More accurately reflects the purpose of the parameter, since we will keep reusing the cache but don't want to reallocate it.
This commit is contained in:
parent
44b4ee194d
commit
3e0fd0e4dd
@ -254,12 +254,12 @@ void CCoinsViewCache::BatchWrite(CoinsViewCacheCursor& cursor, const uint256& ha
|
||||
SetBestBlock(hashBlockIn);
|
||||
}
|
||||
|
||||
void CCoinsViewCache::Flush(bool will_reuse_cache)
|
||||
void CCoinsViewCache::Flush(bool reallocate_cache)
|
||||
{
|
||||
auto cursor{CoinsViewCacheCursor(m_sentinel, cacheCoins, /*will_erase=*/true)};
|
||||
base->BatchWrite(cursor, hashBlock);
|
||||
cacheCoins.clear();
|
||||
if (will_reuse_cache) {
|
||||
if (reallocate_cache) {
|
||||
ReallocateCache();
|
||||
}
|
||||
cachedCoinsUsage = 0;
|
||||
|
||||
@ -446,10 +446,10 @@ public:
|
||||
* Push the modifications applied to this cache to its base and wipe local state.
|
||||
* Failure to call this method or Sync() before destruction will cause the changes
|
||||
* to be forgotten.
|
||||
* If will_reuse_cache is false, the cache will retain the same memory footprint
|
||||
* If reallocate_cache is false, the cache will retain the same memory footprint
|
||||
* after flushing and should be destroyed to deallocate.
|
||||
*/
|
||||
void Flush(bool will_reuse_cache = true);
|
||||
void Flush(bool reallocate_cache = true);
|
||||
|
||||
/**
|
||||
* Push the modifications applied to this cache to its base while retaining
|
||||
|
||||
@ -74,7 +74,7 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsView& backend
|
||||
}
|
||||
},
|
||||
[&] {
|
||||
coins_view_cache.Flush(/*will_reuse_cache=*/fuzzed_data_provider.ConsumeBool());
|
||||
coins_view_cache.Flush(/*reallocate_cache=*/fuzzed_data_provider.ConsumeBool());
|
||||
},
|
||||
[&] {
|
||||
coins_view_cache.Sync();
|
||||
|
||||
@ -391,7 +391,7 @@ FUZZ_TARGET(coinscache_sim)
|
||||
// Apply to simulation data.
|
||||
flush();
|
||||
// Apply to real caches.
|
||||
caches.back()->Flush(/*will_reuse_cache=*/provider.ConsumeBool());
|
||||
caches.back()->Flush(/*reallocate_cache=*/provider.ConsumeBool());
|
||||
},
|
||||
|
||||
[&]() { // Sync.
|
||||
|
||||
@ -2983,7 +2983,7 @@ bool Chainstate::DisconnectTip(BlockValidationState& state, DisconnectedBlockTra
|
||||
LogError("DisconnectTip(): DisconnectBlock %s failed\n", pindexDelete->GetBlockHash().ToString());
|
||||
return false;
|
||||
}
|
||||
view.Flush(/*will_reuse_cache=*/false); // local CCoinsViewCache goes out of scope
|
||||
view.Flush(/*reallocate_cache=*/false); // local CCoinsViewCache goes out of scope
|
||||
}
|
||||
LogDebug(BCLog::BENCH, "- Disconnect block: %.2fms\n",
|
||||
Ticks<MillisecondsDouble>(SteadyClock::now() - time_start));
|
||||
@ -3118,7 +3118,7 @@ bool Chainstate::ConnectTip(
|
||||
Ticks<MillisecondsDouble>(time_3 - time_2),
|
||||
Ticks<SecondsDouble>(m_chainman.time_connect_total),
|
||||
Ticks<MillisecondsDouble>(m_chainman.time_connect_total) / m_chainman.num_blocks_total);
|
||||
view.Flush(/*will_reuse_cache=*/false); // No need to reallocate since it only has capacity for 1 block
|
||||
view.Flush(/*reallocate_cache=*/false); // No need to reallocate since it only has capacity for 1 block
|
||||
}
|
||||
const auto time_4{SteadyClock::now()};
|
||||
m_chainman.time_flush += time_4 - time_3;
|
||||
@ -4921,7 +4921,7 @@ bool Chainstate::ReplayBlocks()
|
||||
}
|
||||
|
||||
cache.SetBestBlock(pindexNew->GetBlockHash());
|
||||
cache.Flush(/*will_reuse_cache=*/false); // local CCoinsViewCache goes out of scope
|
||||
cache.Flush(/*reallocate_cache=*/false); // local CCoinsViewCache goes out of scope
|
||||
m_chainman.GetNotifications().progress(bilingual_str{}, 100, false);
|
||||
return true;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user