GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix race condition between starting HTTP server thread and setting EventBase()

Browse source 
Split StartHTTPServer into InitHTTPServer and StartHTTPServer to give
clients a window to register their handlers without race conditions.

Thanks @ajweiss for figuring this out.
This commit is contained in:
Wladimir J. van der Laan 2015-08-28 16:55:16 +02:00
parent 6d2bc22146
commit 3a174cd400
3 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/httpserver.cpp
View file

@ -320,7 +320,7 @@ static void HTTPWorkQueueRun(WorkQueue<HTTPClosure>* queue)
queue->Run();
}
bool StartHTTPServer(boost::thread_group& threadGroup)
bool InitHTTPServer()
{
struct evhttp* http = 0;
struct event_base* base = 0;
@ -366,19 +366,25 @@ bool StartHTTPServer(boost::thread_group& threadGroup)
return false;
}
LogPrint("http", "Starting HTTP server\n");
LogPrint("http", "Initialized HTTP server\n");
int workQueueDepth = std::max((long)GetArg("-rpcworkqueue", DEFAULT_HTTP_WORKQUEUE), 1L);
int rpcThreads = std::max((long)GetArg("-rpcthreads", DEFAULT_HTTP_THREADS), 1L);
LogPrintf("HTTP: creating work queue of depth %d and %d worker threads\n", workQueueDepth, rpcThreads);
workQueue = new WorkQueue<HTTPClosure>(workQueueDepth);
LogPrintf("HTTP: creating work queue of depth %d\n", workQueueDepth);
threadGroup.create_thread(boost::bind(&ThreadHTTP, base, http));
workQueue = new WorkQueue<HTTPClosure>(workQueueDepth);
eventBase = base;
eventHTTP = http;
return true;
}
bool StartHTTPServer(boost::thread_group& threadGroup)
{
LogPrint("http", "Starting HTTP server\n");
int rpcThreads = std::max((long)GetArg("-rpcthreads", DEFAULT_HTTP_THREADS), 1L);
LogPrintf("HTTP: starting %d worker threads\n", rpcThreads);
threadGroup.create_thread(boost::bind(&ThreadHTTP, eventBase, eventHTTP));
for (int i = 0; i < rpcThreads; i++)
threadGroup.create_thread(boost::bind(&HTTPWorkQueueRun, workQueue));
eventBase = base;
eventHTTP = http;
return true;
}