http: Remove WaitExit from WorkQueue

laanwj · laanwj · commit f94665466ed5 · 2018-02-06T20:32:51.000+01:00
This function, which waits for all threads to exit, is no longer needed
now that threads are joined instead.

Signed-off-by: Wladimir J. van der Laan &lt;laanwj@gmail.com&gt;
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
@@ -99,8 +99,7 @@ class WorkQueue
                                  numThreads(0)
     {
     }
-    /** Precondition: worker threads have all stopped
-     * (call WaitExit)
+    /** Precondition: worker threads have all stopped (they have been joined).
      */
     ~WorkQueue()
     {
@@ -141,13 +140,6 @@ class WorkQueue
         running = false;
         cond.notify_all();
     }
-    /** Wait for worker threads to exit */
-    void WaitExit()
-    {
-        std::unique_lock<std::mutex> lock(cs);
-        while (numThreads > 0)
-            cond.wait(lock);
-    }
 };
 
 struct HTTPPathHandler
@@ -486,7 +478,6 @@ void StopHTTPServer()
     LogPrint(BCLog::HTTP, "Stopping HTTP server\n");
     if (workQueue) {
         LogPrint(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n");
-        workQueue->WaitExit();
         for (auto& thread: g_thread_http_workers) {
             thread.join();
         }

Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,7 @@ class WorkQueue`
`99`	`99`	`numThreads(0)`
`100`	`100`	`{`
`101`	`101`	`}`
`102`		`- /** Precondition: worker threads have all stopped`
`103`		`- * (call WaitExit)`
	`102`	`+ /** Precondition: worker threads have all stopped (they have been joined).`
`104`	`103`	`*/`
`105`	`104`	`~WorkQueue()`
`106`	`105`	`{`
`@@ -141,13 +140,6 @@ class WorkQueue`
`141`	`140`	`running = false;`
`142`	`141`	`cond.notify_all();`
`143`	`142`	`}`
`144`		`- /** Wait for worker threads to exit */`
`145`		`- void WaitExit()`
`146`		`- {`
`147`		`- std::unique_lock<std::mutex> lock(cs);`
`148`		`- while (numThreads > 0)`
`149`		`- cond.wait(lock);`
`150`		`- }`
`151`	`143`	`};`
`152`	`144`
`153`	`145`	`struct HTTPPathHandler`
`@@ -486,7 +478,6 @@ void StopHTTPServer()`
`486`	`478`	`LogPrint(BCLog::HTTP, "Stopping HTTP server\n");`
`487`	`479`	`if (workQueue) {`
`488`	`480`	`LogPrint(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n");`
`489`		`- workQueue->WaitExit();`
`490`	`481`	`for (auto& thread: g_thread_http_workers) {`
`491`	`482`	`thread.join();`
`492`	`483`	`}`