Fix shutdown hang with >= 8 -addnodes set

TheBlueMatt · TheBlueMatt · commit e007b243c484 · 2017-03-08T14:41:57.000-05:00
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.
diff --git a/src/net.cpp b/src/net.cpp
@@ -2322,6 +2322,10 @@ void CConnman::Interrupt()
     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 +2341,6 @@ void CConnman::Stop()
     if (threadSocketHandler.joinable())
         threadSocketHandler.join();
 
-    if (semAddnode)
-        for (int i=0; i<nMaxAddnode; i++)
-            semOutbound->post();
-
     if (fAddressesInitialized)
     {
         DumpData();
