Merge bitcoin/bitcoin#24002: refactor: add thread safety lock assertion to WriteBlockIndexDB()

MarcoFalke · MarcoFalke · commit 6182e5086fc8 · 2022-01-08T09:09:26.000+01:00
1823766 refactor: add thread safety lock assertion to WriteBlockIndexDB() (Jon Atack) Pull request description: New helper function `BlockManager::WriteBlockIndexDB()` added in #23974 has a thread safety lock annotation in its declaration but is missing the corresponding run-time lock assertion in its definition. Per doc/developer-notes.md: "Combine annotations in function declarations with run-time asserts in function definitions." ACKs for top commit: MarcoFalke: cr ACK 1823766 Tree-SHA512: b915e6b105c38b8bbe04ad810aefa68e940a13b8dd265e79563a2aaefc93ffa031d56a7f3c481a5ada90de7c2ddd3b419dcfa46c22fa26c22f95eda15cd243bc
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
@@ -340,6 +340,7 @@ void BlockManager::Unload()
 
 bool BlockManager::WriteBlockIndexDB()
 {
+    AssertLockHeld(::cs_main);
     std::vector<std::pair<int, const CBlockFileInfo*>> vFiles;
     vFiles.reserve(m_dirty_fileinfo.size());
     for (std::set<int>::iterator it = m_dirty_fileinfo.begin(); it != m_dirty_fileinfo.end();) {

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ void BlockManager::Unload()`
`340`	`340`
`341`	`341`	`bool BlockManager::WriteBlockIndexDB()`
`342`	`342`	`{`
	`343`	`+ AssertLockHeld(::cs_main);`
`343`	`344`	`std::vector<std::pair<int, const CBlockFileInfo*>> vFiles;`
`344`	`345`	`vFiles.reserve(m_dirty_fileinfo.size());`
`345`	`346`	`for (std::set<int>::iterator it = m_dirty_fileinfo.begin(); it != m_dirty_fileinfo.end();) {`