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

Fix possible crashes when quiting message loop.

Browse source
This commit is contained in:
Cheng Zhao 2014-01-08 11:55:54 +08:00
parent 93d5a2e195
commit 968f75529a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/node_bindings.cc
View file

@ -65,7 +65,8 @@ NodeBindings::NodeBindings(bool is_browser)
: is_browser_(is_browser), : is_browser_(is_browser),
message_loop_(NULL), message_loop_(NULL),
uv_loop_(uv_default_loop()), uv_loop_(uv_default_loop()),
embed_closed_(false) { embed_closed_(false),
weak_factory_(this) {
} }
NodeBindings::~NodeBindings() { NodeBindings::~NodeBindings() {
@ -76,7 +77,6 @@ NodeBindings::~NodeBindings() {
// Wait for everything to be done. // Wait for everything to be done.
uv_thread_join(&embed_thread_); uv_thread_join(&embed_thread_);
message_loop_->RunUntilIdle();
// Clear uv. // Clear uv.
uv_sem_destroy(&embed_sem_); uv_sem_destroy(&embed_sem_);
@ -209,7 +209,7 @@ void NodeBindings::UvRunOnce() {
void NodeBindings::WakeupMainThread() { void NodeBindings::WakeupMainThread() {
DCHECK(message_loop_); DCHECK(message_loop_);
message_loop_->PostTask(FROM_HERE, base::Bind(&NodeBindings::UvRunOnce, message_loop_->PostTask(FROM_HERE, base::Bind(&NodeBindings::UvRunOnce,
base::Unretained(this))); weak_factory_.GetWeakPtr()));
} }
void NodeBindings::WakeupEmbedThread() { void NodeBindings::WakeupEmbedThread() {

3
common/node_bindings.h
View file

@ -6,6 +6,7 @@
#define ATOM_COMMON_NODE_BINDINGS_H_ #define ATOM_COMMON_NODE_BINDINGS_H_
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
#include "v8/include/v8.h" #include "v8/include/v8.h"
#include "vendor/node/deps/uv/include/uv.h" #include "vendor/node/deps/uv/include/uv.h"
@ -83,6 +84,8 @@ class NodeBindings {
// Semaphore to wait for main loop in the embed thread. // Semaphore to wait for main loop in the embed thread.
uv_sem_t embed_sem_; uv_sem_t embed_sem_;
base::WeakPtrFactory<NodeBindings> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(NodeBindings); DISALLOW_COPY_AND_ASSIGN(NodeBindings);
}; };