phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-27 11:43:26 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

http: Remove WaitExit from WorkQueue

Browse source 
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 <laanwj@gmail.com>
This commit is contained in:
Wladimir J. van der Laan 2018-02-06 20:32:33 +01:00
parent b1c2370dde
commit f94665466e
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/httpserver.cpp
View file

@ -99,8 +99,7 @@ public:
numThreads(0) numThreads(0)
{ {
} }
/** Precondition: worker threads have all stopped /** Precondition: worker threads have all stopped (they have been joined).
* (call WaitExit)
*/ */
~WorkQueue() ~WorkQueue()
{ {
@ -141,13 +140,6 @@ public:
running = false; running = false;
cond.notify_all(); 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 struct HTTPPathHandler
@ -486,7 +478,6 @@ void StopHTTPServer()
LogPrint(BCLog::HTTP, "Stopping HTTP server\n"); LogPrint(BCLog::HTTP, "Stopping HTTP server\n");
if (workQueue) { if (workQueue) {
LogPrint(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n"); LogPrint(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n");
workQueue->WaitExit();
for (auto& thread: g_thread_http_workers) { for (auto& thread: g_thread_http_workers) {
thread.join(); thread.join();
} }