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

Fix bogus outOfWaiters event loop exit reason for active event waits.

Browse source
This commit is contained in:
Sönke Ludwig 2017-02-22 17:35:26 +01:00
parent 578065f70a
commit bcc059e6d7
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/eventcore/drivers/winapi/events.d
View file

@ -57,13 +57,17 @@ final class WinAPIEventDriverEvents : EventDriverEvents {
auto pe = event in m_events; auto pe = event in m_events;
assert(pe !is null, "Invalid event ID passed to triggerEvent."); assert(pe !is null, "Invalid event ID passed to triggerEvent.");
if (notify_all) { if (notify_all) {
foreach (w; pe.waiters.consume) foreach (w; pe.waiters.consume) {
m_core.removeWaiter();
w(event); w(event);
}
} else { } else {
if (!pe.waiters.empty) if (!pe.waiters.empty) {
m_core.removeWaiter();
pe.waiters.consumeOne()(event); pe.waiters.consumeOne()(event);
} }
} }
}
override void trigger(EventID event, bool notify_all = true) shared override void trigger(EventID event, bool notify_all = true) shared
{ {
@ -82,6 +86,7 @@ final class WinAPIEventDriverEvents : EventDriverEvents {
override void wait(EventID event, EventCallback on_event) override void wait(EventID event, EventCallback on_event)
{ {
m_core.addWaiter();
return m_events[event].waiters.put(on_event); return m_events[event].waiters.put(on_event);
} }
@ -91,6 +96,7 @@ final class WinAPIEventDriverEvents : EventDriverEvents {
import std.algorithm.mutation : remove; import std.algorithm.mutation : remove;
m_events[event].waiters.removePending(on_event); m_events[event].waiters.removePending(on_event);
m_core.removeWaiter();
} }
override void addRef(EventID descriptor) override void addRef(EventID descriptor)