diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2016-12-27 17:11:57 -0500 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2017-01-03 17:53:09 -0500 |
commit | 7325b1556684158461c9c0df056c9d071444b54e (patch) | |
tree | 191dd644161c06211bd041502f968c757ece4677 | |
parent | 2a524b8e8fe69ef487fd8ea1b4f7a03f473ed201 (diff) |
net: a few small cleanups before replacing boost threads
- Drop the interruption point directly after the pnode allocation. This would
be leaky if hit.
- Rearrange thread creation so that the socket handler comes first
-rw-r--r-- | src/net.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/net.cpp b/src/net.cpp index 3ac9623548..9c58577f10 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1806,7 +1806,6 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai return false; CNode* pnode = ConnectNode(addrConnect, pszDest, fCountFailure); - boost::this_thread::interruption_point(); if (!pnode) return false; @@ -2146,14 +2145,14 @@ bool CConnman::Start(boost::thread_group& threadGroup, CScheduler& scheduler, st // Start threads // + // Send and receive from sockets, accept connections + threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "net", boost::function<void()>(boost::bind(&CConnman::ThreadSocketHandler, this)))); + if (!GetBoolArg("-dnsseed", true)) LogPrintf("DNS seeding disabled\n"); else threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "dnsseed", boost::function<void()>(boost::bind(&CConnman::ThreadDNSAddressSeed, this)))); - // Send and receive from sockets, accept connections - threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "net", boost::function<void()>(boost::bind(&CConnman::ThreadSocketHandler, this)))); - // Initiate outbound connections from -addnode threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "addcon", boost::function<void()>(boost::bind(&CConnman::ThreadOpenAddedConnections, this)))); |