Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix periodic timer callbacks firing after calling Timer.stop(). #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Geod24 merged 1 commit into from
Mar 15, 2021
Merged

Fix periodic timer callbacks firing after calling Timer.stop(). #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions source/vibe/core/core.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,8 +1028,9 @@ Timer createTimer(void delegate() nothrow @safe callback = null)
bool m_running = false;
bool m_pendingFire = false;

void opCall() nothrow @safe {
runTask(() nothrow {
void opCall(Timer tm)
nothrow @safe {
runTask((Timer tm) nothrow {
if (m_running) {
m_pendingFire = true;
return;
Expand All @@ -1041,8 +1042,14 @@ Timer createTimer(void delegate() nothrow @safe callback = null)
do {
m_pendingFire = false;
m_callback();

// make sure that no callbacks are fired after the timer
// has been actively stopped
if (m_pendingFire && !tm.pending)
m_pendingFire = false;

} while (m_pendingFire);
});
}, tm);
}
}

Expand Down Expand Up @@ -1071,7 +1078,8 @@ Timer createTimer(void delegate() nothrow @safe callback = null)
See_also: `createTimer`
*/
Timer createLeanTimer(CALLABLE)(CALLABLE callback)
if (is(typeof(() @safe nothrow { callback(); } ())))
if (is(typeof(() @safe nothrow { callback(); } ()))
|| is(typeof(() @safe nothrow { callback(Timer.init); } ())))
{
return Timer.create(eventDriver.timers.create(), callback);
}
Expand Down Expand Up @@ -1400,7 +1408,13 @@ private struct TimerCallbackHandler(CALLABLE) {
if (fired) {
auto l = yieldLock();
auto cb = () @trusted { return &eventDriver.timers.userData!CALLABLE(timer); } ();
(*cb)();
static if (is(typeof(CALLABLE.init(Timer.init)))) {
Timer tm;
tm.m_driver = eventDriver;
tm.m_id = timer;
eventDriver.timers.addRef(timer);
(*cb)(tm);
} else (*cb)();
}

if (!eventDriver.timers.isUnique(timer) || eventDriver.timers.isPending(timer))
Expand Down