sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#21750: net: remove unnecessary check of CNode::cs_vSend

Browse Source 
9096b13a4764873511b65f32a005ce4738b0d81c net: remove unnecessary check of CNode::cs_vSend (Vasil Dimov)

Pull request description:

  It is not possible to have a node in `CConnman::vNodesDisconnected` and
  its reference count to be incremented - all `CNode::AddRef()` are done
  either before the node is added to `CConnman::vNodes` or while holding
  `CConnman::cs_vNodes` and the object being in `CConnman::vNodes`.

  So, the object being in `CConnman::vNodesDisconnected` and its reference
  count being zero means that it is not and will not start to be used by
  other threads.

  So, the lock of `CNode::cs_vSend` in `CConnman::DisconnectNodes()` will
  always succeed and is not necessary.

  Indeed all locks of `CNode::cs_vSend` are done either when the reference
  count is >0 or under the protection of `CConnman::cs_vNodes` and the
  node being in `CConnman::vNodes`.

ACKs for top commit:
  MarcoFalke:
    review ACK 9096b13a4764873511b65f32a005ce4738b0d81c 🏧
  jnewbery:
    utACK 9096b13a4764873511b65f32a005ce4738b0d81c

Tree-SHA512: 910899cdcdc8934642eb0c40fcece8c3b01b7e20a0b023966b9d6972db6a885cb3a9a04e9562bae14d5833967e45e2ecb3687b94d495060c3da4b1f2afb0ac8f
This commit is contained in:
MarcoFalke 2021-05-03 08:13:49 +02:00 committed by Konstantin Akimov
parent b34514191f
commit 23b83109ea
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net.cpp
View File

@ -1566,21 +1566,11 @@ void CConnman::DisconnectNodes()
for (auto it = m_nodes_disconnected.begin(); it != m_nodes_disconnected.end(); ) for (auto it = m_nodes_disconnected.begin(); it != m_nodes_disconnected.end(); )
{ {
CNode* pnode = *it; CNode* pnode = *it;
// wait until threads are done using it // Destroy the object only after other threads have stopped using it.
bool fDelete = false;
if (pnode->GetRefCount() <= 0) { if (pnode->GetRefCount() <= 0) {
{
TRY_LOCK(pnode->cs_vSend, lockSend);
if (lockSend) {
fDelete = true;
}
}
if (fDelete) {
it = m_nodes_disconnected.erase(it); it = m_nodes_disconnected.erase(it);
DeleteNode(pnode); DeleteNode(pnode);
} } else {
}
if (!fDelete) {
++it; ++it;
} }
} }