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

Add an uninterruptible variant of Task.join.

Browse source
This commit is contained in:
Sönke Ludwig 2017-01-29 20:20:08 +01:00
parent 96b798200c
commit d0a55ef374
No known key found for this signature in database
GPG key ID: D95E8DB493EE314C
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/vibe/core/task.d
View file

@ -83,7 +83,8 @@ struct Task {
T opCast(T)() const @safe nothrow if (is(T == bool)) { return m_fiber !is null; } T opCast(T)() const @safe nothrow if (is(T == bool)) { return m_fiber !is null; }
void join() @trusted { if (running) taskFiber.join(m_taskCounter); } // FIXME: this is NOT thread safe void join() @trusted { if (running) taskFiber.join!true(m_taskCounter); } // FIXME: this is NOT thread safe
void joinUninterruptible() @trusted nothrow { if (running) taskFiber.join!false(m_taskCounter); } // FIXME: this is NOT thread safe
void interrupt() @trusted nothrow { if (running) taskFiber.interrupt(m_taskCounter); } // FIXME: this is NOT thread safe void interrupt() @trusted nothrow { if (running) taskFiber.interrupt(m_taskCounter); } // FIXME: this is NOT thread safe
string toString() const @safe { import std.string; return format("%s:%s", () @trusted { return cast(void*)m_fiber; } (), m_taskCounter); } string toString() const @safe { import std.string; return format("%s:%s", () @trusted { return cast(void*)m_fiber; } (), m_taskCounter); }
@ -416,11 +417,14 @@ final package class TaskFiber : Fiber {
/** Blocks until the task has ended. /** Blocks until the task has ended.
*/ */
void join(size_t task_counter) void join(bool interruptiple)(size_t task_counter)
@trusted { @trusted {
auto cnt = m_onExit.emitCount; auto cnt = m_onExit.emitCount;
while (m_running && m_taskCounter == task_counter) while (m_running && m_taskCounter == task_counter)
static if (interruptiple)
cnt = m_onExit.wait(1.seconds, cnt); cnt = m_onExit.wait(1.seconds, cnt);
else
cnt = m_onExit.waitUninterruptible(1.seconds, cnt);
} }
/** Throws an InterruptExeption within the task as soon as it calls an interruptible function. /** Throws an InterruptExeption within the task as soon as it calls an interruptible function.