Try to properly disconnect and delete nodes on shutdown

UdjinM6 · UdjinM6 · commit 035a8417374c · 2020-01-20T23:02:03.000+03:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -1240,28 +1240,24 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
     }
 }
 
-void CConnman::ThreadSocketHandler()
-{
-    unsigned int nPrevNodeCount = 0;
-    while (!interruptNet)
+void CConnman::DisconnectAndDeleteNodes(bool fDisconectAll)
 {
     //
     // Disconnect nodes
     //
     {
         LOCK(cs_vNodes);
-            // Disconnect unused nodes
         std::vector<CNode*> vNodesCopy = vNodes;
         for (CNode* pnode : vNodesCopy)
         {
-                if (pnode->fDisconnect)
+            if (pnode->fDisconnect || fDisconectAll)
             {
                 if (fLogIPs) {
-                        LogPrintf("ThreadSocketHandler -- removing node: peer=%d addr=%s nRefCount=%d fInbound=%d fMasternode=%d\n",
-                              pnode->GetId(), pnode->addr.ToString(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
+                    LogPrintf("%s -- removing node: peer=%d addr=%s nRefCount=%d fInbound=%d fMasternode=%d\n",
+                          __func__, pnode->GetId(), pnode->addr.ToString(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
                 } else {
-                        LogPrintf("ThreadSocketHandler -- removing node: peer=%d nRefCount=%d fInbound=%d fMasternode=%d\n",
-                              pnode->GetId(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
+                    LogPrintf("%s -- removing node: peer=%d nRefCount=%d fInbound=%d fMasternode=%d\n",
+                          __func__, pnode->GetId(), pnode->GetRefCount(), pnode->fInbound, pnode->fMasternode);
                 }
 
                 // remove from vNodes
@@ -1280,7 +1276,6 @@ void CConnman::ThreadSocketHandler()
             }
         }
     }
-        {
     // Delete disconnected nodes
     std::list<CNode*> vNodesDisconnectedCopy = vNodesDisconnected;
     for (CNode* pnode : vNodesDisconnectedCopy)
@@ -1304,6 +1299,15 @@ void CConnman::ThreadSocketHandler()
         }
     }
 }
+
+void CConnman::ThreadSocketHandler()
+{
+    unsigned int nPrevNodeCount = 0;
+    while (!interruptNet)
+    {
+        // Disconnect unused nodes
+        DisconnectAndDeleteNodes(false);
+
         size_t vNodesSize;
         {
             LOCK(cs_vNodes);
@@ -2735,21 +2739,24 @@ void CConnman::Stop()
         fAddressesInitialized = false;
     }
 
+    // Try to disconnect and delete all nodes
+    // TODO: it looks like smth is holding nodes sometimes not releasing references properly,
+    // so we only try a few times here (cause otherwise we might end up waiting forever).
+    for (int i = 0; i < 10; ++i) {
+        DisconnectAndDeleteNodes(true);
+        if (vNodesDisconnected.empty()) {
+            // All nodes were disconected and deleted, no need to loop any further
+            break;
+        }
+        MilliSleep(100);
+    }
+
     // Close sockets
-    for (CNode* pnode : vNodes)
-        pnode->CloseSocketDisconnect();
     for (ListenSocket& hListenSocket : vhListenSocket)
         if (hListenSocket.socket != INVALID_SOCKET)
             if (!CloseSocket(hListenSocket.socket))
                 LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError()));
 
-    // clean up some globals (to help leak detection)
-    for (CNode *pnode : vNodes) {
-        DeleteNode(pnode);
-    }
-    for (CNode *pnode : vNodesDisconnected) {
-        DeleteNode(pnode);
-    }
     vNodes.clear();
     vNodesDisconnected.clear();
     vhListenSocket.clear();
diff --git a/src/net.h b/src/net.h
@@ -470,6 +470,7 @@ class CConnman
     void ThreadOpenConnections(std::vector<std::string> connect);
     void ThreadMessageHandler();
     void AcceptConnection(const ListenSocket& hListenSocket);
+    void DisconnectAndDeleteNodes(bool fDisconectAll);
     void ThreadSocketHandler();
     void ThreadDNSAddressSeed();
     void ThreadOpenMasternodeConnections();
