diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-01-08 09:09:23 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-01-08 09:09:26 +0100 |
| commit | 6182e5086fc82b49a5f0d2abdab4bc7e2a4686ef (patch) | |
| tree | b00e9079989569b5fe3e40fcdf4356469d929816 | |
| parent | 018fd9620293582f0ce43d344ac3110e19c4dedc (diff) | |
| parent | 1823766fc69a3d57767af11f182826533465f621 (diff) | |
Merge bitcoin/bitcoin#24002: refactor: add thread safety lock assertion to WriteBlockIndexDB()
1823766fc69a3d57767af11f182826533465f621 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 1823766fc69a3d57767af11f182826533465f621
Tree-SHA512: b915e6b105c38b8bbe04ad810aefa68e940a13b8dd265e79563a2aaefc93ffa031d56a7f3c481a5ada90de7c2ddd3b419dcfa46c22fa26c22f95eda15cd243bc
| -rw-r--r-- | src/node/blockstorage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp index 8127ebd769..50c3059567 100644 --- 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();) { |