diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/init.cpp | 3 | ||||
-rw-r--r-- | src/main.cpp | 26 | ||||
-rw-r--r-- | src/net.cpp | 20 |
3 files changed, 44 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index bb22b1d246..aac46d489d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1027,6 +1027,9 @@ bool AppInit2() if (fServer) NewThread(ThreadRPCServer, NULL); + // Generate coins in the background + GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain); + // ********************************************************* Step 12: finished uiInterface.InitMessage(_("Done loading")); diff --git a/src/main.cpp b/src/main.cpp index b29091b4fe..60593c0d5f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4764,3 +4764,29 @@ uint64 CTxOutCompressor::DecompressAmount(uint64 x) } return n; } + + +class CMainCleanup +{ +public: + CMainCleanup() {} + ~CMainCleanup() { + // block headers + std::map<uint256, CBlockIndex*>::iterator it1 = mapBlockIndex.begin(); + for (; it1 != mapBlockIndex.end(); it1++) + delete (*it1).second; + mapBlockIndex.clear(); + + // orphan blocks + std::map<uint256, CBlock*>::iterator it2 = mapOrphanBlocks.begin(); + for (; it2 != mapOrphanBlocks.end(); it2++) + delete (*it2).second; + mapOrphanBlocks.clear(); + + // orphan transactions + std::map<uint256, CDataStream*>::iterator it3 = mapOrphanTransactions.begin(); + for (; it3 != mapOrphanTransactions.end(); it3++) + delete (*it3).second; + mapOrphanTransactions.clear(); + } +} instance_of_cmaincleanup; diff --git a/src/net.cpp b/src/net.cpp index 9ee6cb423c..669f44b639 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -775,12 +775,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 { // @@ -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() @@ -2088,6 +2085,7 @@ bool StopNode() Sleep(20); Sleep(50); DumpAddresses(); + return true; } @@ -2108,6 +2106,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(); |