phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-25 10:43:19 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[net processing] Rename PoissonNextSendInbound to NextInvToInbounds

Browse source
This commit is contained in:
John Newbery 2021-12-14 10:46:09 +00:00 • committed by Martin Zumsande
parent ea99f5d01e
commit 9b8dcb25b5
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/net_processing.cpp
View file

@ -444,7 +444,7 @@ private:
*/ */
std::map<NodeId, PeerRef> m_peer_map GUARDED_BY(m_peer_mutex); std::map<NodeId, PeerRef> m_peer_map GUARDED_BY(m_peer_mutex);
std::atomic<std::chrono::microseconds> m_next_send_inv_to_incoming{0us}; std::atomic<std::chrono::microseconds> m_next_inv_to_inbounds{0us};
/** Number of nodes with fSyncStarted. */ /** Number of nodes with fSyncStarted. */
int nSyncStarted GUARDED_BY(cs_main) = 0; int nSyncStarted GUARDED_BY(cs_main) = 0;
@ -526,8 +526,8 @@ private:
* peer, a spy node could make multiple inbound connections to us to * peer, a spy node could make multiple inbound connections to us to
* accurately determine when we received the transaction (and potentially * accurately determine when we received the transaction (and potentially
* determine the transaction's origin). */ * determine the transaction's origin). */
std::chrono::microseconds PoissonNextSendInbound(std::chrono::microseconds now, std::chrono::microseconds NextInvToInbounds(std::chrono::microseconds now,
std::chrono::seconds average_interval); std::chrono::seconds average_interval);
/** Have we requested this block from a peer */ /** Have we requested this block from a peer */
bool IsBlockRequested(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main); bool IsBlockRequested(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
@ -830,16 +830,16 @@ static void UpdatePreferredDownload(const CNode& node, CNodeState* state) EXCLUS
nPreferredDownload += state->fPreferredDownload; nPreferredDownload += state->fPreferredDownload;
} }
std::chrono::microseconds PeerManagerImpl::PoissonNextSendInbound(std::chrono::microseconds now, std::chrono::microseconds PeerManagerImpl::NextInvToInbounds(std::chrono::microseconds now,
std::chrono::seconds average_interval) std::chrono::seconds average_interval)
{ {
if (m_next_send_inv_to_incoming.load() < now) { if (m_next_inv_to_inbounds.load() < now) {
// If this function were called from multiple threads simultaneously // If this function were called from multiple threads simultaneously
// it would possible that both update the next send variable, and return a different result to their caller. // it would possible that both update the next send variable, and return a different result to their caller.
// This is not possible in practice as only the net processing thread invokes this function. // This is not possible in practice as only the net processing thread invokes this function.
m_next_send_inv_to_incoming = GetExponentialRand(now, average_interval); m_next_inv_to_inbounds = GetExponentialRand(now, average_interval);
} }
return m_next_send_inv_to_incoming; return m_next_inv_to_inbounds;
} }
bool PeerManagerImpl::IsBlockRequested(const uint256& hash) bool PeerManagerImpl::IsBlockRequested(const uint256& hash)
@ -4809,7 +4809,7 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
if (pto->m_tx_relay->nNextInvSend < current_time) { if (pto->m_tx_relay->nNextInvSend < current_time) {
fSendTrickle = true; fSendTrickle = true;
if (pto->IsInboundConn()) { if (pto->IsInboundConn()) {
pto->m_tx_relay->nNextInvSend = PoissonNextSendInbound(current_time, INBOUND_INVENTORY_BROADCAST_INTERVAL); pto->m_tx_relay->nNextInvSend = NextInvToInbounds(current_time, INBOUND_INVENTORY_BROADCAST_INTERVAL);
} else { } else {
pto->m_tx_relay->nNextInvSend = GetExponentialRand(current_time, OUTBOUND_INVENTORY_BROADCAST_INTERVAL); pto->m_tx_relay->nNextInvSend = GetExponentialRand(current_time, OUTBOUND_INVENTORY_BROADCAST_INTERVAL);
} }