highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-10 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shutdown hang with >= 8 -addnodes set

Browse Source 
We previously would block waiting for a CSemaphoreGrant in
ThreadOpenAddedConnections, when we did not need to. This would
block as the posts in CConnman shutdown were both to the wrong
semaphore and in the wrong location.

Github-Pull: #9953
Rebased-From: e007b243c4
This commit is contained in:
Matt Corallo
2017-03-08 14:41:57 -05:00
parent 43a987c1cb
commit d2548a4f97
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net.cpp
View File

@@ -2321,6 +2321,10 @@ void CConnman::Interrupt()
if (semOutbound) if (semOutbound)
for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++) for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++)
semOutbound->post(); semOutbound->post();
if (semAddnode)
for (int i=0; i<nMaxAddnode; i++)
semAddnode->post();
} }
void CConnman::Stop() void CConnman::Stop()
@@ -2336,10 +2340,6 @@ void CConnman::Stop()
if (threadSocketHandler.joinable()) if (threadSocketHandler.joinable())
threadSocketHandler.join(); threadSocketHandler.join();
if (semAddnode)
for (int i=0; i<nMaxAddnode; i++)
semOutbound->post();
if (fAddressesInitialized) if (fAddressesInitialized)
{ {
DumpData(); DumpData();