aboutsummaryrefslogtreecommitdiff
path: root/src/httpserver.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2018-02-06 19:27:13 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2018-02-06 20:10:09 +0100
commitb1c2370dde9ade180c638e5d9a4797f085322b5b (patch)
tree02ebdb4ac8d4e0903692da747acb4e4b94801b92 /src/httpserver.cpp
parent1462bde767a121233118c04c5629bd9de1ba0f16 (diff)
http: Join worker threads before deleting work queue
This prevents a potential race condition if control flow ends up in `ShutdownHTTPServer` before the thread gets to `queue->Run()`, deleting the work queue while workers are still going to use it. Meant to fix #12362. Signed-off-by: Wladimir J. van der Laan <laanwj@gmail.com>
Diffstat (limited to 'src/httpserver.cpp')
-rw-r--r--src/httpserver.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index a022d220e0..a554dcb097 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -449,6 +449,7 @@ bool UpdateHTTPServerLogging(bool enable) {
std::thread threadHTTP;
std::future<bool> threadResult;
+static std::vector<std::thread> g_thread_http_workers;
bool StartHTTPServer()
{
@@ -460,8 +461,7 @@ bool StartHTTPServer()
threadHTTP = std::thread(std::move(task), eventBase, eventHTTP);
for (int i = 0; i < rpcThreads; i++) {
- std::thread rpc_worker(HTTPWorkQueueRun, workQueue);
- rpc_worker.detach();
+ g_thread_http_workers.emplace_back(HTTPWorkQueueRun, workQueue);
}
return true;
}
@@ -487,6 +487,10 @@ void StopHTTPServer()
if (workQueue) {
LogPrint(BCLog::HTTP, "Waiting for HTTP worker threads to exit\n");
workQueue->WaitExit();
+ for (auto& thread: g_thread_http_workers) {
+ thread.join();
+ }
+ g_thread_http_workers.clear();
delete workQueue;
workQueue = nullptr;
}