rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6251 Attempt to fix Windows event loop hang

This commit is contained in:
Andrew Nelless 2018-03-18 20:50:26 +00:00 committed by GitHub
parent a2929a7920
commit 4a3a5d5b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/platform/MSWindowsEventQueueBuffer.cpp
View File

@ -62,7 +62,7 @@ MSWindowsEventQueueBuffer::waitForEvent(double timeout)
// MsgWaitForMultipleObjects() will block even if the queue isn't // MsgWaitForMultipleObjects() will block even if the queue isn't
// empty if the messages in the queue were there before the last // empty if the messages in the queue were there before the last
// call to GetMessage()/PeekMessage(). // call to GetMessage()/PeekMessage().
if (HIWORD(GetQueueStatus(QS_ALLINPUT)) != 0) { if (HIWORD(GetQueueStatus(QS_ALLPOSTMESSAGE)) != 0) {
return; return;
} }
@ -79,12 +79,14 @@ MSWindowsEventQueueBuffer::waitForEvent(double timeout)
// cancellation but that's okay because we're run in the main // cancellation but that's okay because we're run in the main
// thread and we never cancel that thread. // thread and we never cancel that thread.
HANDLE dummy[1]; HANDLE dummy[1];
MsgWaitForMultipleObjects(0, dummy, FALSE, t, QS_ALLINPUT); MsgWaitForMultipleObjects(0, dummy, FALSE, t, QS_ALLPOSTMESSAGE);
} }
IEventQueueBuffer::Type IEventQueueBuffer::Type
MSWindowsEventQueueBuffer::getEvent(Event& event, UInt32& dataID) MSWindowsEventQueueBuffer::getEvent(Event& event, UInt32& dataID)
{ {
// NOTE: QS_ALLINPUT was replaced with QS_ALLPOSTMESSAGE.
//
// peek at messages first. waiting for QS_ALLINPUT will return // peek at messages first. waiting for QS_ALLINPUT will return
// if a message has been sent to our window but GetMessage will // if a message has been sent to our window but GetMessage will
// dispatch that message behind our backs and block. PeekMessage // dispatch that message behind our backs and block. PeekMessage
@ -128,7 +130,7 @@ MSWindowsEventQueueBuffer::addEvent(UInt32 dataID)
bool bool
MSWindowsEventQueueBuffer::isEmpty() const MSWindowsEventQueueBuffer::isEmpty() const
{ {
return (HIWORD(GetQueueStatus(QS_ALLINPUT)) == 0); return (HIWORD(GetQueueStatus(QS_ALLPOSTMESSAGE)) == 0);
} }
EventQueueTimer* EventQueueTimer*