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

Merge pull request #81 from vibe-d/windows_event_poll_fixes

Browse source 
Remove special case for zero-wait processing off events.
This commit is contained in:
Sönke Ludwig 2018-06-05 12:12:31 +02:00 committed by GitHub
parent abdbc91c4b 5d317ca9e7
commit 00ef149c04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
source/eventcore/drivers/winapi/core.d
View file

@ -73,28 +73,21 @@ final class WinAPIEventDriverCore : EventDriverCore {
if (!waiterCount) return ExitReason.outOfWaiters; if (!waiterCount) return ExitReason.outOfWaiters;
bool got_event; bool got_event;
long now = currStdTime;
do {
auto nextto = min(m_timers.getNextTimeout(now), timeout);
got_event |= doProcessEvents(nextto);
long prev_step = now;
now = currStdTime;
got_event |= m_timers.process(now);
if (timeout <= 0.seconds) { if (m_exit) {
got_event = doProcessEvents(0.seconds); m_exit = false;
got_event |= m_timers.process(currStdTime); return ExitReason.exited;
return got_event ? ExitReason.idle : ExitReason.timeout; } else if (got_event) break;
} else { if (timeout != Duration.max)
long now = currStdTime; timeout -= (now - prev_step).hnsecs;
do { } while (timeout > 0.seconds);
auto nextto = min(m_timers.getNextTimeout(now), timeout);
got_event |= doProcessEvents(nextto);
long prev_step = now;
now = currStdTime;
got_event |= m_timers.process(now);
if (m_exit) {
m_exit = false;
return ExitReason.exited;
} else if (got_event) break;
if (timeout != Duration.max)
timeout -= (now - prev_step).hnsecs;
} while (timeout > 0.seconds);
}
if (!waiterCount) return ExitReason.outOfWaiters; if (!waiterCount) return ExitReason.outOfWaiters;
if (got_event) return ExitReason.idle; if (got_event) return ExitReason.idle;
@ -159,41 +152,39 @@ final class WinAPIEventDriverCore : EventDriverCore {
private bool doProcessEvents(Duration max_wait) private bool doProcessEvents(Duration max_wait)
{ {
import core.time : seconds; import core.time : seconds;
import std.algorithm.comparison : min; import std.algorithm.comparison : min, max;
executeThreadCallbacks(); executeThreadCallbacks();
bool got_event; bool got_event;
if (max_wait > 0.seconds) { DWORD timeout_msecs = max_wait == Duration.max ? INFINITE : cast(DWORD)min(max(max_wait.total!"msecs", 0), DWORD.max);
DWORD timeout_msecs = max_wait == Duration.max ? INFINITE : cast(DWORD)min(max_wait.total!"msecs", DWORD.max); auto ret = () @trusted { return MsgWaitForMultipleObjectsEx(cast(DWORD)m_registeredEvents.length, m_registeredEvents.ptr,
auto ret = () @trusted { return MsgWaitForMultipleObjectsEx(cast(DWORD)m_registeredEvents.length, m_registeredEvents.ptr, timeout_msecs, QS_ALLEVENTS, MWMO_ALERTABLE|MWMO_INPUTAVAILABLE); } ();
timeout_msecs, QS_ALLEVENTS, MWMO_ALERTABLE|MWMO_INPUTAVAILABLE); } ();
while (!m_ioEvents.empty) { while (!m_ioEvents.empty) {
auto evt = m_ioEvents.consumeOne(); auto evt = m_ioEvents.consumeOne();
evt.process(evt.error, evt.bytesTransferred, evt.overlapped); evt.process(evt.error, evt.bytesTransferred, evt.overlapped);
}
if (ret == WAIT_IO_COMPLETION) got_event = true;
else if (ret >= WAIT_OBJECT_0 && ret < WAIT_OBJECT_0 + m_registeredEvents.length) {
if (auto pc = m_registeredEvents[ret - WAIT_OBJECT_0] in m_eventCallbacks) {
(*pc)();
got_event = true;
}
}
/*if (ret == WAIT_OBJECT_0) {
got_event = true;
Win32TCPConnection[] to_remove;
foreach( fw; m_fileWriters.byKey )
if( fw.testFileWritten() )
to_remove ~= fw;
foreach( fw; to_remove )
m_fileWriters.remove(fw);
}*/
} }
if (ret == WAIT_IO_COMPLETION) got_event = true;
else if (ret >= WAIT_OBJECT_0 && ret < WAIT_OBJECT_0 + m_registeredEvents.length) {
if (auto pc = m_registeredEvents[ret - WAIT_OBJECT_0] in m_eventCallbacks) {
(*pc)();
got_event = true;
}
}
/*if (ret == WAIT_OBJECT_0) {
got_event = true;
Win32TCPConnection[] to_remove;
foreach( fw; m_fileWriters.byKey )
if( fw.testFileWritten() )
to_remove ~= fw;
foreach( fw; to_remove )
m_fileWriters.remove(fw);
}*/
MSG msg; MSG msg;
//uint cnt = 0; //uint cnt = 0;
while (() @trusted { return PeekMessageW(&msg, null, 0, 0, PM_REMOVE); } ()) { while (() @trusted { return PeekMessageW(&msg, null, 0, 0, PM_REMOVE); } ()) {