diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-10 13:42:59 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-10 13:42:59 -0700 |
| commit | d1020b780a1493c6a709f70756b2af54a7126f40 (patch) | |
| tree | 6427b7d81d191194f0c2bc09e93b9dc23627f0a0 /src/net.cpp | |
| parent | 61983b3d1626359705b300ac82d9cfb6b77eb746 (diff) | |
| parent | 53e71135de2933ef1204bb02487d4c45a95d2e28 (diff) | |
| download | bitcoin-d1020b780a1493c6a709f70756b2af54a7126f40.tar.xz | |
Merge pull request #2553 from Diapolo/threads
changes to thread code (directly use boost::thread)
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/net.cpp b/src/net.cpp index adc5f93029..1f8b39ac98 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -389,11 +389,8 @@ bool GetMyExternalIP(CNetAddr& ipRet) return false; } -void ThreadGetMyExternalIP(void* parg) +void ThreadGetMyExternalIP() { - // Make this thread recognisable as the external IP detection thread - RenameThread("bitcoin-ext-ip"); - CNetAddr addrLocalHost; if (GetMyExternalIP(addrLocalHost)) { @@ -1151,7 +1148,7 @@ void MapPort(bool fUseUPnP) upnp_thread->join(); delete upnp_thread; } - upnp_thread = new boost::thread(boost::bind(&TraceThread<boost::function<void()> >, "upnp", &ThreadMapPort)); + upnp_thread = new boost::thread(boost::bind(&TraceThread<void (*)()>, "upnp", &ThreadMapPort)); } else if (upnp_thread) { upnp_thread->interrupt(); @@ -1800,7 +1797,7 @@ void static Discover() // Don't use external IPv4 discovery, when -onlynet="IPv6" if (!IsLimited(NET_IPV4)) - NewThread(ThreadGetMyExternalIP, NULL); + boost::thread(boost::bind(&TraceThread<void (*)()>, "ext-ip", &ThreadGetMyExternalIP)); } void StartNode(boost::thread_group& threadGroup) @@ -1823,7 +1820,7 @@ void StartNode(boost::thread_group& threadGroup) if (!GetBoolArg("-dnsseed", true)) printf("DNS seeding disabled\n"); else - threadGroup.create_thread(boost::bind(&TraceThread<boost::function<void()> >, "dnsseed", &ThreadDNSAddressSeed)); + threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "dnsseed", &ThreadDNSAddressSeed)); #ifdef USE_UPNP // Map ports with UPnP |