From 3427517d507a938074a50fa8ea6dfe3d13bef357 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Fri, 29 Mar 2013 02:17:10 +0100
Subject: Clean up global datastructures at shutdown.

This should make detecting leaks much easier.
---
 src/net.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/net.cpp')

diff --git a/src/net.cpp b/src/net.cpp
index 3406a28b0..ed2e662fd 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -660,12 +660,12 @@ void ThreadSocketHandler(void* parg)
     printf("ThreadSocketHandler exited\n");
 }
 
+static list<CNode*> vNodesDisconnected;
+
 void ThreadSocketHandler2(void* parg)
 {
     printf("ThreadSocketHandler started\n");
-    list<CNode*> vNodesDisconnected;
     unsigned int nPrevNodeCount = 0;
-
     loop
     {
         //
@@ -1992,6 +1992,7 @@ bool StopNode()
         Sleep(20);
     Sleep(50);
     DumpAddresses();
+
     return true;
 }
 
@@ -2012,6 +2013,18 @@ public:
                 if (closesocket(hListenSocket) == SOCKET_ERROR)
                     printf("closesocket(hListenSocket) failed with error %d\n", WSAGetLastError());
 
+        // clean up some globals (to help leak detection)
+        BOOST_FOREACH(CNode *pnode, vNodes)
+            delete pnode;
+        BOOST_FOREACH(CNode *pnode, vNodesDisconnected)
+            delete pnode;
+        vNodes.clear();
+        vNodesDisconnected.clear();
+        delete semOutbound;
+        semOutbound = NULL;
+        delete pnodeLocalHost;
+        pnodeLocalHost = NULL;
+
 #ifdef WIN32
         // Shutdown Windows Sockets
         WSACleanup();
-- 
cgit v1.2.3


From a0cafb7945cb81616586fa82a1419d826f9a2c6e Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@exmulti.com>
Date: Sun, 31 Mar 2013 01:54:27 -0400
Subject: Move GenerateBitcoins() call out of net.cpp's StartNode()

The internal miner is closely bound to the wallet engine,
not the blockchain engine.
---
 src/net.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/net.cpp')

diff --git a/src/net.cpp b/src/net.cpp
index 9ee6cb423..6f3c8a51a 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2047,9 +2047,6 @@ void StartNode(void* parg)
     // Dump network addresses
     if (!NewThread(ThreadDumpAddress, NULL))
         printf("Error; NewThread(ThreadDumpAddress) failed\n");
-
-    // Generate coins in the background
-    GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain);
 }
 
 bool StopNode()
-- 
cgit v1.2.3