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

Avoid bogus "A task cannot interrupt itself" assertion failure.

Browse source 
Calling Task.interrupt() on a task that is already finished, but ran on the same fiber would trigger an assertion failure instead of returning silently.
This commit is contained in:
Sönke Ludwig 2020-11-19 16:06:49 +01:00
parent a170973cfd
commit 3182160a9a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,14 @@ struct Task {
void join() @trusted { if (m_fiber) m_fiber.join!true(m_taskCounter); } void join() @trusted { if (m_fiber) m_fiber.join!true(m_taskCounter); }
void joinUninterruptible() @trusted nothrow { if (m_fiber) m_fiber.join!false(m_taskCounter); } void joinUninterruptible() @trusted nothrow { if (m_fiber) m_fiber.join!false(m_taskCounter); }
void interrupt() @trusted nothrow { if (m_fiber) m_fiber.interrupt(m_taskCounter); } void interrupt() @trusted nothrow { if (m_fiber && this.running) m_fiber.interrupt(m_taskCounter); }
unittest { // regression test for bogus "task cannot interrupt itself"
import vibe.core.core : runTask;
auto t = runTask({});
t.join();
runTask({ t.interrupt(); }).join();
}
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); }
@ -138,7 +145,6 @@ struct Task {
} }
} }
/** Settings to control the behavior of newly started tasks. /** Settings to control the behavior of newly started tasks.
*/ */
struct TaskSettings { struct TaskSettings {