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

Use select to query the uv kqueue

Browse source 
This resolves #38. I've verified that events still get processed like they
should on El Capitan 10.11.3 (15D21).
This commit is contained in:
Ryan Patterson 2016-05-02 23:54:21 -07:00
parent 543211b53a
commit b15c07e1a8
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
atom/common/node_bindings_mac.cc
View file

@ -5,6 +5,7 @@
#include "atom/common/node_bindings_mac.h" #include "atom/common/node_bindings_mac.h"
#include <errno.h> #include <errno.h>
#include <sys/select.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
@ -14,13 +15,7 @@
namespace atom { namespace atom {
NodeBindingsMac::NodeBindingsMac(bool is_browser) NodeBindingsMac::NodeBindingsMac(bool is_browser)
: NodeBindings(is_browser), : NodeBindings(is_browser) {
kqueue_(kqueue()) {
// Add uv's backend fd to kqueue.
struct kevent ev;
EV_SET(&ev, uv_backend_fd(uv_loop_), EVFILT_READ, EV_ADD | EV_ENABLE,
0, 0, 0);
kevent(kqueue_, &ev, 1, NULL, 0, NULL);
} }
NodeBindingsMac::~NodeBindingsMac() { NodeBindingsMac::~NodeBindingsMac() {
@ -44,19 +39,22 @@ void NodeBindingsMac::OnWatcherQueueChanged(uv_loop_t* loop) {
} }
void NodeBindingsMac::PollEvents() { void NodeBindingsMac::PollEvents() {
struct timespec spec; struct timeval tv;
int timeout = uv_backend_timeout(uv_loop_); int timeout = uv_backend_timeout(uv_loop_);
if (timeout != -1) { if (timeout != -1) {
spec.tv_sec = timeout / 1000; tv.tv_sec = timeout / 1000;
spec.tv_nsec = (timeout % 1000) * 1000000; tv.tv_usec = (timeout % 1000) * 1000;
} }
fd_set readset;
int fd = uv_backend_fd(uv_loop_);
FD_ZERO(&readset);
FD_SET(fd, &readset);
// Wait for new libuv events. // Wait for new libuv events.
int r; int r;
do { do {
struct kevent ev; r = select(fd + 1, &readset, NULL, NULL, timeout == -1 ? NULL : &tv);
r = ::kevent(kqueue_, NULL, 0, &ev, 1,
timeout == -1 ? NULL : &spec);
} while (r == -1 && errno == EINTR); } while (r == -1 && errno == EINTR);
} }

3
atom/common/node_bindings_mac.h
View file

@ -23,9 +23,6 @@ class NodeBindingsMac : public NodeBindings {
void PollEvents() override; void PollEvents() override;
// Kqueue to poll for uv's backend fd.
int kqueue_;
DISALLOW_COPY_AND_ASSIGN(NodeBindingsMac); DISALLOW_COPY_AND_ASSIGN(NodeBindingsMac);
}; };