Skip to content

Conversation

dergoegge
Copy link
Member

@dergoegge dergoegge commented Mar 31, 2023

Addresses left over feedback from #26140.

mapRelay is only accessed from the message processing thread and does not need to be kept in sync with anything validation specific, it is therfore perfectly fine to have it guarded by g_msgproc_mutex.

Taking cs_main is no longer necessary since we moved
`m_recently_announced_invs` to `Peer` and `mapRelay` is actually only
accessed from the message processing thread.
@fanquake fanquake requested a review from jnewbery March 31, 2023 11:22
@fanquake fanquake changed the title #26140 follow-ups net: #26140 follow-ups Mar 31, 2023
@fanquake fanquake added the P2P label Mar 31, 2023
@dergoegge dergoegge changed the title net: #26140 follow-ups net processing: #26140 follow-ups Mar 31, 2023
@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 31, 2023

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

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK jnewbery, hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@maflcko maflcko removed the P2P label Mar 31, 2023
@DrahtBot DrahtBot added the P2P label Mar 31, 2023
@dergoegge
Copy link
Member Author

CI failure is intermittent, see #27380

@jnewbery
Copy link
Contributor

utACK 3fa4c54

@DrahtBot DrahtBot removed the request for review from jnewbery March 31, 2023 16:05
@hebasto
Copy link
Member

hebasto commented Mar 31, 2023

Concept ACK.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 3fa4c54, I have reviewed the code and it looks OK, I agree it can be merged.

Comment on lines -320 to -323
const TxRelay* GetTxRelay() const EXCLUSIVE_LOCKS_REQUIRED(!m_tx_relay_mutex)
{
return WITH_LOCK(m_tx_relay_mutex, return m_tx_relay.get());
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@fanquake fanquake merged commit 8e9e2b4 into bitcoin:master Apr 2, 2023
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 2, 2023
@bitcoin bitcoin locked and limited conversation to collaborators Apr 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants