From c4aa2ba82211ea5988ed7fe21e1b08bc3367e6d4 Mon Sep 17 00:00:00 2001 From: Suhas Daftuar Date: Fri, 8 Mar 2019 15:30:36 -0500 Subject: [refactor] Change tx_relay structure to be unique_ptr --- src/net.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/net.cpp') diff --git a/src/net.cpp b/src/net.cpp index 527c001308..78b33954d6 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -500,8 +500,8 @@ void CNode::copyStats(CNodeStats &stats) X(addr); X(addrBind); { - LOCK(m_tx_relay.cs_filter); - stats.fRelayTxes = m_tx_relay.fRelayTxes; + LOCK(m_tx_relay->cs_filter); + stats.fRelayTxes = m_tx_relay->fRelayTxes; } X(nLastSend); X(nLastRecv); @@ -529,8 +529,8 @@ void CNode::copyStats(CNodeStats &stats) X(m_legacyWhitelisted); X(m_permissionFlags); { - LOCK(m_tx_relay.cs_feeFilter); - stats.minFeeFilter = m_tx_relay.minFeeFilter; + LOCK(m_tx_relay->cs_feeFilter); + stats.minFeeFilter = m_tx_relay->minFeeFilter; } // It is common for nodes with good ping times to suddenly become lagged, @@ -818,11 +818,11 @@ bool CConnman::AttemptToEvictConnection() continue; if (node->fDisconnect) continue; - LOCK(node->m_tx_relay.cs_filter); + LOCK(node->m_tx_relay->cs_filter); NodeEvictionCandidate candidate = {node->GetId(), node->nTimeConnected, node->nMinPingUsecTime, node->nLastBlockTime, node->nLastTXTime, HasAllDesirableServiceFlags(node->nServices), - node->m_tx_relay.fRelayTxes, node->m_tx_relay.pfilter != nullptr, node->addr, node->nKeyedNetGroup, + node->m_tx_relay->fRelayTxes, node->m_tx_relay->pfilter != nullptr, node->addr, node->nKeyedNetGroup, node->m_prefer_evict}; vEvictionCandidates.push_back(candidate); } @@ -2633,6 +2633,7 @@ CNode::CNode(NodeId idIn, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn hSocket = hSocketIn; addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn; hashContinue = uint256(); + m_tx_relay = MakeUnique(); for (const std::string &msg : getAllNetMessageTypes()) mapRecvBytesPerMsgCmd[msg] = 0; -- cgit v1.2.3