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

Merge pull request #96 from vibe-d/fix_taskpool_shutdown

Browse source 
Fix TaskPool shutdown and hanging test case
merged-on-behalf-of: Sönke Ludwig <s-ludwig@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-10-27 03:01:00 +02:00 committed by GitHub
parent 9a4217cd88 4394374364
commit 38a1ef761c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/vibe/core/taskpool.d
View file

@ -71,7 +71,6 @@ shared final class TaskPool {
m_state.lock.term = true; m_state.lock.term = true;
m_signal.emit(); m_signal.emit();
auto ec = m_signal.emitCount;
while (true) { while (true) {
WorkerThread th; WorkerThread th;
with (m_state.lock) with (m_state.lock)
@ -81,6 +80,9 @@ shared final class TaskPool {
} }
if (!th) break; if (!th) break;
if (th is Thread.getThis())
continue;
() @trusted { () @trusted {
try th.join(); try th.join();
catch (Exception e) { catch (Exception e) {
@ -271,9 +273,8 @@ private final class WorkerThread : Thread {
logDebug("worker thread enter"); logDebug("worker thread enter");
TaskFuncInfo taskfunc; TaskFuncInfo taskfunc;
while(true){
auto emit_count = m_pool.m_signal.emitCount; auto emit_count = m_pool.m_signal.emitCount;
while(true) {
with (m_pool.m_state.lock) { with (m_pool.m_state.lock) {
logDebug("worker thread check"); logDebug("worker thread check");
@ -282,7 +283,7 @@ private final class WorkerThread : Thread {
if (m_queue.consume(taskfunc)) { if (m_queue.consume(taskfunc)) {
logDebug("worker thread got specific task"); logDebug("worker thread got specific task");
} else if (queue.consume(taskfunc)) { } else if (queue.consume(taskfunc)) {
logDebug("worker thread got specific task"); logDebug("worker thread got unspecific task");
} }
} }

2
tests/issue-58-task-already-scheduled.d
View file

@ -38,7 +38,7 @@ void main()
void worker() void worker()
{ {
ev.wait(); ev.wait(0);
ev.emit(); ev.emit();
setTimer(dur!"seconds"(1), { setTimer(dur!"seconds"(1), {
auto c = atomicOp!"+="(counter, 1); auto c = atomicOp!"+="(counter, 1);