mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix for issue 1968: use uv_backend_timeout to determine timeout to match other platforms

Browse source
This commit is contained in:
Matt Mastracci 2015-08-20 19:59:58 -06:00
parent 8cc602ff94
commit e628c7b37d
1 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
atom/common/node_bindings_win.cc
View file

@ -22,37 +22,26 @@ NodeBindingsWin::~NodeBindingsWin() {
} }
void NodeBindingsWin::PollEvents() { void NodeBindingsWin::PollEvents() {
// Unlike Unix, in which we can just rely on one backend fd to determine // If there are other kinds of events pending, uv_backend_timeout will
// whether we should iterate libuv loop, on Window, IOCP is just one part // instruct us not to wait.
// of the libuv loop, we should also check whether we have other types of DWORD bytes, timeout;
// events. ULONG_PTR key;
bool block = uv_loop_->idle_handles == NULL && OVERLAPPED* overlapped;
uv_loop_->pending_reqs_tail == NULL &&
uv_loop_->endgame_handles == NULL &&
!uv_loop_->stop_flag &&
(uv_loop_->active_handles > 0 ||
!QUEUE_EMPTY(&uv_loop_->active_reqs));
// When there is no other types of events, we block on the IOCP. timeout = uv_backend_timeout(uv_loop_);
if (block) {
DWORD bytes, timeout;
ULONG_PTR key;
OVERLAPPED* overlapped;
timeout = uv_backend_timeout(uv_loop_); GetQueuedCompletionStatus(uv_loop_->iocp,
GetQueuedCompletionStatus(uv_loop_->iocp, &bytes,
&bytes, &key,
&key, &overlapped,
&overlapped, timeout);
timeout);
// Give the event back so libuv can deal with it. // Give the event back so libuv can deal with it.
if (overlapped != NULL) if (overlapped != NULL)
PostQueuedCompletionStatus(uv_loop_->iocp, PostQueuedCompletionStatus(uv_loop_->iocp,
bytes, bytes,
key, key,
overlapped); overlapped);
}
} }
// static // static