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

Remove the on_watcher_queue_updated hack.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-15 19:48:36 +08:00
parent 998e9792fb
commit abf982e4e5
3 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
common/node_bindings_mac.cc
View file

@ -26,23 +26,6 @@ NodeBindingsMac::NodeBindingsMac(bool is_browser)
NodeBindingsMac::~NodeBindingsMac() { NodeBindingsMac::~NodeBindingsMac() {
} }
void NodeBindingsMac::RunMessageLoop() {
// Get notified when libuv's watcher queue changes.
uv_loop_->data = this;
uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;
NodeBindings::RunMessageLoop();
}
// static
void NodeBindingsMac::OnWatcherQueueChanged(uv_loop_t* loop) {
NodeBindingsMac* self = static_cast<NodeBindingsMac*>(loop->data);
// We need to break the io polling in the kqueue thread when loop's watcher
// queue changes, otherwise new events cannot be notified.
self->WakeupEmbedThread();
}
void NodeBindingsMac::PollEvents() { void NodeBindingsMac::PollEvents() {
struct timespec spec; struct timespec spec;
int timeout = uv_backend_timeout(uv_loop_); int timeout = uv_backend_timeout(uv_loop_);

5
common/node_bindings_mac.h
View file

@ -15,12 +15,7 @@ class NodeBindingsMac : public NodeBindings {
explicit NodeBindingsMac(bool is_browser); explicit NodeBindingsMac(bool is_browser);
virtual ~NodeBindingsMac(); virtual ~NodeBindingsMac();
virtual void RunMessageLoop() OVERRIDE;
private: private:
// Called when uv's watcher queue changes.
static void OnWatcherQueueChanged(uv_loop_t* loop);
virtual void PollEvents() OVERRIDE; virtual void PollEvents() OVERRIDE;
// Kqueue to poll for uv's backend fd. // Kqueue to poll for uv's backend fd.

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 2fce49829b4dde69bceed91c00cec578517541b0 Subproject commit efc9599187eb8a3b350b8f6eb7aa463a7d1c329f