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

Fix premature event loop exit in case of waiting for events in the Posix driver.

Browse source
This commit is contained in:
Sönke Ludwig 2017-01-22 02:30:00 +01:00
parent 0e38717669
commit 924f2087f2
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/posix.d
View file

@ -143,7 +143,9 @@ final class PosixEventDriverCore(Loop : PosixEventLoop, Timers : EventDriverTime
return ExitReason.exited; return ExitReason.exited;
} }
if (!waiterCount) return ExitReason.outOfWaiters; if (!waiterCount) {
return ExitReason.outOfWaiters;
}
bool got_events; bool got_events;
@ -167,7 +169,9 @@ final class PosixEventDriverCore(Loop : PosixEventLoop, Timers : EventDriverTime
m_exit = false; m_exit = false;
return ExitReason.exited; return ExitReason.exited;
} }
if (!waiterCount) return ExitReason.outOfWaiters; if (!waiterCount) {
return ExitReason.outOfWaiters;
}
if (got_events) return ExitReason.idle; if (got_events) return ExitReason.idle;
return ExitReason.timeout; return ExitReason.timeout;
} }
@ -1190,6 +1194,7 @@ final class PosixEventDriverEvents(Loop : PosixEventLoop) : EventDriverEvents {
final override void wait(EventID event, EventCallback on_event) final override void wait(EventID event, EventCallback on_event)
{ {
m_loop.m_waiterCount++;
return getSlot(event).waiters.put(on_event); return getSlot(event).waiters.put(on_event);
} }
@ -1198,6 +1203,7 @@ final class PosixEventDriverEvents(Loop : PosixEventLoop) : EventDriverEvents {
import std.algorithm.searching : countUntil; import std.algorithm.searching : countUntil;
import std.algorithm.mutation : remove; import std.algorithm.mutation : remove;
m_loop.m_waiterCount--;
getSlot(event).waiters.removePending(on_event); getSlot(event).waiters.removePending(on_event);
} }