Browse Source

Merge #9953: Fix shutdown hang with >= 8 -addnodes set

819b513 Add missing braces in semaphore posts in net (Matt Corallo)
e007b24 Fix shutdown hang with >= 8 -addnodes set (Matt Corallo)

Tree-SHA512: f2d7562bd5d333cd0e80562eb3b1fe329fc10ee713996e053d2ed669db6d9eb39550e0a6c6ab768cd070bfe92a5ea85e0f752470206706de196bd4a689b9bc07
0.15
Wladimir J. van der Laan 8 years ago
parent
commit
f8a709161f
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 16
      src/net.cpp

16
src/net.cpp

@ -2319,9 +2319,17 @@ void CConnman::Interrupt() @@ -2319,9 +2319,17 @@ void CConnman::Interrupt()
interruptNet();
InterruptSocks5(true);
if (semOutbound)
for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++)
if (semOutbound) {
for (int i=0; i<(nMaxOutbound + nMaxFeeler); i++) {
semOutbound->post();
}
}
if (semAddnode) {
for (int i=0; i<nMaxAddnode; i++) {
semAddnode->post();
}
}
}
void CConnman::Stop()
@ -2337,10 +2345,6 @@ void CConnman::Stop() @@ -2337,10 +2345,6 @@ void CConnman::Stop()
if (threadSocketHandler.joinable())
threadSocketHandler.join();
if (semAddnode)
for (int i=0; i<nMaxAddnode; i++)
semOutbound->post();
if (fAddressesInitialized)
{
DumpData();

Loading…
Cancel
Save