highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-06 21:57:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#34813: threads: qa: Add lock order annotation for TxMempool::cs

Browse Source 
9085dee476 qa: Add lock order annotation for TxMempool::cs (David Gumberg)

Pull request description:

  I added this to see if static analysis would catch any lock order inversions while investigating #34731, it did not catch any but it is a worthwhile defense against statically-analyzable inversions of `cs_main->TxMempool::cs`.

ACKs for top commit:
  sedited:
    tested ACK 9085dee476
  hebasto:
    ACK 9085dee476.
  w0xlt:
    ACK 9085dee476

Tree-SHA512: 498605362e7b197b7643a3f9ffd04589bc9b245aca1d245d289efa145906248c1a72f9fbf4835a9378aabe170b747dc0cc033105915a2bf7a9989de368710c02
This commit is contained in:
merge-script
2026-03-13 00:02:21 +00:00
parent f1e0245f89 9085dee476
commit 5f75d90c38
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/txmempool.h
View File

@@ -257,7 +257,7 @@ public:
* changing the chain tip. It's necessary to keep both mutexes locked until
* the mempool is consistent with the new chain tip and fully populated.
*/
mutable RecursiveMutex cs;
mutable RecursiveMutex cs ACQUIRED_AFTER(::cs_main);
std::unique_ptr<TxGraph> m_txgraph GUARDED_BY(cs);
mutable std::unique_ptr<TxGraph::BlockBuilder> m_builder GUARDED_BY(cs);
indexed_transaction_set mapTx GUARDED_BY(cs);