debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix shutdown of the worker thread pool.

Browse source 
Shuts down the pool before terminating the threads to avoid accessing an event thread waiter slot that is not associated with a valid eventcore driver anymore.
This commit is contained in:
Sönke Ludwig 2018-02-22 20:09:31 +01:00
parent 53ea380df8
commit d2146e3881
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/vibe/core/core.d
View file

@ -254,6 +254,7 @@ void exitEventLoop(bool shutdown_all_threads = false)
assert(s_eventLoopRunning || shutdown_all_threads, "Exiting event loop when none is running."); assert(s_eventLoopRunning || shutdown_all_threads, "Exiting event loop when none is running.");
if (shutdown_all_threads) { if (shutdown_all_threads) {
() @trusted nothrow { () @trusted nothrow {
shutdownWorkerPool();
atomicStore(st_term, true); atomicStore(st_term, true);
st_threadsSignal.emit(); st_threadsSignal.emit();
} (); } ();
@ -1349,13 +1350,8 @@ static ~this()
} }
if (is_main_thread) { if (is_main_thread) {
shared(TaskPool) tpool;
synchronized (st_threadsMutex) swap(tpool, st_workerPool);
if (tpool) {
logDiagnostic("Main thread still waiting for worker threads.");
tpool.terminate();
}
logDiagnostic("Main thread exiting"); logDiagnostic("Main thread exiting");
shutdownWorkerPool();
} }
synchronized (st_threadsMutex) { synchronized (st_threadsMutex) {
@ -1373,6 +1369,19 @@ static ~this()
st_threadShutdownCondition.notifyAll(); st_threadShutdownCondition.notifyAll();
} }
private void shutdownWorkerPool()
nothrow {
shared(TaskPool) tpool;
try synchronized (st_threadsMutex) swap(tpool, st_workerPool);
catch (Exception e) assert(false, e.msg);
if (tpool) {
logDiagnostic("Still waiting for worker threads to exit.");
tpool.terminate();
}
}
private void shutdownDriver() private void shutdownDriver()
{ {
if (ManualEvent.ms_threadEvent != EventID.init) { if (ManualEvent.ms_threadEvent != EventID.init) {