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

AtomBindings should not use default uv loop

Browse source
This commit is contained in:
Cheng Zhao 2017-03-10 17:07:51 +09:00
parent 9c9c8ec5f1
commit c068285ff8
7 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/common/api/atom_bindings.cc
View file

@ -78,8 +78,8 @@ void FatalErrorCallback(const char* location, const char* message) {
} // namespace
AtomBindings::AtomBindings() {
uv_async_init(uv_default_loop(), &call_next_tick_async_, OnCallNextTick);
AtomBindings::AtomBindings(uv_loop_t* loop) {
uv_async_init(loop, &call_next_tick_async_, OnCallNextTick);
call_next_tick_async_.data = this;
}

2
atom/common/api/atom_bindings.h
View file

@ -20,7 +20,7 @@ namespace atom {
class AtomBindings {
public:
AtomBindings();
explicit AtomBindings(uv_loop_t* loop);
virtual ~AtomBindings();
// Add process.atomBinding function, which behaves like process.binding but

4
atom/common/node_bindings.cc
View file

@ -116,6 +116,10 @@ NodeBindings::~NodeBindings() {
// Clear uv.
uv_sem_destroy(&embed_sem_);
uv_close(reinterpret_cast<uv_handle_t*>(&dummy_uv_handle_), nullptr);
// Destroy loop.
if (uv_loop_ != uv_default_loop())
uv_loop_delete(uv_loop_);
}
void NodeBindings::Initialize() {

6
atom/common/node_bindings.h
View file

@ -52,6 +52,8 @@ class NodeBindings {
void set_uv_env(node::Environment* env) { uv_env_ = env; }
node::Environment* uv_env() const { return uv_env_; }
uv_loop_t* uv_loop() const { return uv_loop_; }
protected:
explicit NodeBindings(BrowserEnvironment browser_env);
@ -70,10 +72,10 @@ class NodeBindings {
// Which environment we are running.
BrowserEnvironment browser_env_;
// Main thread's MessageLoop.
// Current thread's MessageLoop.
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
// Main thread's libuv loop.
// Current thread's libuv loop.
uv_loop_t* uv_loop_;
private: