net processing: Don't require locking cs_main before calling RelayTransactions() #21845
Conversation
|
unsigned cr ACK 9012512a57283bdcd0cc0562680d5de2f304af9f |
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
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. |
promag
left a comment
There was a problem hiding this comment.
Code review ACK 9012512a57283bdcd0cc0562680d5de2f304af9f.
Callers of the external RelayTransactions() no longer need to lock cs_main.
9012512 to
39e1971
Compare
|
Thanks for the review @promag. I've addressed your review comments. |
|
re-unsigned-code-review ACK 39e1971 |
|
|
||
| void PeerManagerImpl::RelayTransaction(const uint256& txid, const uint256& wtxid) | ||
| { | ||
| WITH_LOCK(cs_main, _RelayTransaction(txid, wtxid);); |
There was a problem hiding this comment.
No need for ;); -- there's already a terminating ; in the WITH_LOCK #define. Could just use a plain LOCK instead of WITH_LOCK too...
…fore calling RelayTransactions() 39e1971 [net processing] Add internal _RelayTransactions() (John Newbery) Pull request description: As part of the general effort to reduce cs_main usage in net_processing, this removes the need to be holding `cs_main` when calling `RelayTransactions()` from outside net_processing. Internally, we lock `cs_main` and call an internal `_RelayTransactions()` function that _does_ require `cs_main`. ACKs for top commit: MarcoFalke: re-unsigned-code-review ACK 39e1971 promag: Code review ACK 39e1971, just included sync.h since last review. ajtowns: ACK 39e1971 Tree-SHA512: dc08441233adfb8eaac501cf497cb4bad029eb723bd3fa8a3d8b7e49cc984c98859b95780ad15f5701d62ac745a8223beb0df405e3d49d95a8c86c8be17c9543
As part of the general effort to reduce cs_main usage in net_processing, this removes the need to be holding
cs_mainwhen callingRelayTransactions()from outside net_processing. Internally, we lockcs_mainand call an internal_RelayTransactions()function that does requirecs_main.