Split out from #19306.
Only trivial thread safety annotations and lock assertions added. No new locks. No behavior change.
This is a step to make CTxMemPool::cs an instance of Mutex rather RecursiveMutex.
Avoid locking CTxMemPool::cs recursively in Mempool{Info}ToJSON() #19652
pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:200803-mmx-2 changing 3 files +9 −3-
hebasto commented at 1:26 PM on August 3, 2020: member
- hebasto marked this as a draft on Aug 3, 2020
- hebasto force-pushed on Aug 3, 2020
- hebasto marked this as ready for review on Aug 3, 2020
- DrahtBot added the label RPC/REST/ZMQ on Aug 3, 2020
- DrahtBot added the label Tests on Aug 3, 2020
-
practicalswift commented at 3:48 PM on August 3, 2020: contributor
Concept ACK: thanks for adding thread-safety annotations!
-
DrahtBot commented at 6:55 PM on August 3, 2020: member
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Conflicts
Reviewers, this pull request conflicts with the following ones:
- #19806 (validation: UTXO snapshot activation by jamesob)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
- hebasto renamed this:
Add thread safety annotations to Mempool{Info}ToJSON()
Avoid locking CTxMemPool::cs recursively in Mempool{Info}ToJSON()
on Sep 6, 2020 - DrahtBot added the label Needs rebase on Sep 23, 2020
- hebasto force-pushed on Nov 8, 2020
-
hebasto commented at 9:20 PM on November 8, 2020: member
Rebased ef803c32d28d103b548fa5eb18b6faa17c7153cf -> dd427ddc4d3570aa0afbccb10869703366ea6cb1 (pr19652.02 -> pr19652.03) due to the conflict with #19572.
- DrahtBot removed the label Needs rebase on Nov 8, 2020
- DrahtBot added the label Needs rebase on Dec 7, 2020
-
09b1ef2262
refactor: Add thread safety annotations to Mempool{Info}ToJSON()
This change avoids locking CTxMemPool::cs recursively in Mempool{Info}ToJSON() functions. - hebasto force-pushed on Dec 7, 2020
-
hebasto commented at 2:04 PM on December 7, 2020: member
Rebased dd427ddc4d3570aa0afbccb10869703366ea6cb1 -> 09b1ef2262e72e708b71a3e70948f8a42ceb1030 (pr19652.03 -> pr19652.04) due to the conflict with #18766.
- DrahtBot removed the label Needs rebase on Dec 7, 2020
-
DrahtBot commented at 8:21 PM on February 16, 2021: member
<!--cf906140f33d8803c4a75a2196329ecb-->
🐙 This pull request conflicts with the target branch and needs rebase.
<sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>
- DrahtBot added the label Needs rebase on Feb 16, 2021
- hebasto closed this on Aug 24, 2021
- DrahtBot locked this on Aug 24, 2022
Contributors