txmempool: add thread safety annotations #22003

pull ajtowns wants to merge 1 commits into bitcoin:master from ajtowns:202105-mempoolguards changing 2 files +8 −7

ajtowns commented at 2:34 PM on May 20, 2021: contributor

Add missing thread safety guards to CTxMempool members.
hebasto commented at 2:35 PM on May 20, 2021: member

Concept ACK.
ajtowns cross-referenced this on May 20, 2021 from issue net_processing: lock clean up by ajtowns

in src/txmempool.h:482 in 05d319dc9e outdated

 478 | @@ -479,21 +479,21 @@ class CTxMemPool
 479 |  protected:
 480 |      const int m_check_ratio; //!< Value n means that 1 times in n we check.
 481 |      std::atomic<unsigned int> nTransactionsUpdated{0}; //!< Used by getblocktemplate to trigger CreateNewBlock() invocation
 482 | -    CBlockPolicyEstimator* minerPolicyEstimator;
 483 | +    CBlockPolicyEstimator* minerPolicyEstimator GUARDED_BY(cs);

vasild commented at 3:22 PM on May 20, 2021:

This is only ever modified by assigning it in the constructor, can be const like m_check_ratio.

    CBlockPolicyEstimator* const minerPolicyEstimator;

ajtowns commented at 2:14 AM on May 21, 2021:

And the object protects itself via its own mutex. Done.

hebasto approved
hebasto commented at 3:25 PM on May 20, 2021: member

ACK 05d319dc9ed2a33f2a08a698dc6d8b74ff77229b, I have reviewed the code and it looks OK, I agree it can be merged.
DrahtBot added the label Mempool on May 20, 2021
practicalswift commented at 6:33 PM on May 20, 2021: contributor

Concept ACK

Thanks for making the thread-safety annotations more complete!
txmempool: add thread safety annotations 793b268284
ajtowns force-pushed on May 21, 2021
DrahtBot commented at 4:05 AM on May 21, 2021: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #21618 (WIP: Reduce MinRelayFee slower when Mempool utilised and faster when needed. by rebroad)
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 approved
hebasto commented at 5:42 AM on May 21, 2021: member

re-ACK 793b2682841b0bdd7eb93163e34728765cfe52b2, only suggested changes since my previous review.
DrahtBot cross-referenced this on May 21, 2021 from issue WIP: Reduce MinRelayFee slower when Mempool utilised and faster when needed. by rebroad
MarcoFalke commented at 6:27 AM on May 21, 2021: member

cr ACK 793b2682841b0bdd7eb93163e34728765cfe52b2
MarcoFalke merged this on May 21, 2021
MarcoFalke closed this on May 21, 2021
vasild commented at 8:06 AM on May 21, 2021: contributor

ACK 793b2682841b0bdd7eb93163e34728765cfe52b2
sidhujag referenced this in commit 6887f7bc36 on May 21, 2021
ryanofsky cross-referenced this on May 25, 2021 from issue Add fee_est tool for debugging fee estimation code by ryanofsky
Fabcien referenced this in commit e92930083c on Apr 6, 2022
gwillen referenced this in commit b9027c994c on Jun 1, 2022
bitcoin locked this on Aug 18, 2022

Contributors

Labels

Linked (view graph)

#10443 Add fee_est tool for debugging fee estimation code #21527 net_processing: lock clean up

txmempool: add thread safety annotations #22003

Conflicts