Skip to content

Commit 1f7acfd

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24024: Remove cs_main lock annotation from ChainstateManager.m_blockman
ce95fb3 Remove cs_main lock annotation from ChainstateManager.m_blockman (Ryan Ofsky) Pull request description: `BlockManager` is a large data structure, and `cs_main` is not required to take its address or access every part of it. Individual `BlockManager` fields and methods which do require `cs_main` like `m_block_index` and `LookupBlockIndex` are already annotated separately, and these other annotations describe locking requirements more accurately and do a better job enforcing thread safety. Since `cs_main` is not needed to access the address of the m_block object, this commit drops `cs_main` LOCK calls which were added pointlessly to satisfy this annotation in the past. Code changes were made by dongcarl, I just wrote the commit description ACKs for top commit: MarcoFalke: cr ACK ce95fb3 dongcarl: crACK ce95fb3 jonatack: ACK ce95fb3 per `git range-diff db1f04f 5a1c413 ce95fb3` change since last push is rebase and dropping braces on the member initialization Tree-SHA512: b18a6ebcc70bea750485f04d4feb7bb28450fea2176e513be9cc242e9f63b24254c5659e74eb6d6045c706a3aaeb94688937b25b7ca7653f8aa3cf8c18845d5a
2 parents db1f04f + ce95fb3 commit 1f7acfd

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/test/fuzz/coins_view.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ FUZZ_TARGET_INIT(coins_view, initialize_coins_view)
273273
CCoinsStats stats{CoinStatsHashType::HASH_SERIALIZED};
274274
bool expected_code_path = false;
275275
try {
276-
(void)GetUTXOStats(&coins_view_cache, WITH_LOCK(::cs_main, return std::ref(g_setup->m_node.chainman->m_blockman)), stats);
276+
(void)GetUTXOStats(&coins_view_cache, g_setup->m_node.chainman->m_blockman, stats);
277277
} catch (const std::logic_error&) {
278278
expected_code_path = true;
279279
}

src/validation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4873,7 +4873,7 @@ bool ChainstateManager::PopulateAndValidateSnapshot(
48734873
// about the snapshot_chainstate.
48744874
CCoinsViewDB* snapshot_coinsdb = WITH_LOCK(::cs_main, return &snapshot_chainstate.CoinsDB());
48754875

4876-
if (!GetUTXOStats(snapshot_coinsdb, WITH_LOCK(::cs_main, return std::ref(m_blockman)), stats, breakpoint_fnc)) {
4876+
if (!GetUTXOStats(snapshot_coinsdb, m_blockman, stats, breakpoint_fnc)) {
48774877
LogPrintf("[snapshot] failed to generate coins stats\n");
48784878
return false;
48794879
}

src/validation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ class ChainstateManager
828828
std::thread m_load_block;
829829
//! A single BlockManager instance is shared across each constructed
830830
//! chainstate to avoid duplicating block metadata.
831-
node::BlockManager m_blockman GUARDED_BY(::cs_main);
831+
node::BlockManager m_blockman;
832832

833833
/**
834834
* In order to efficiently track invalidity of headers, we keep the set of

0 commit comments

Comments
 (0)