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

Fix a possible dead lock when quiting.

Browse source 
It could happen that we are quitting when the embed thread is still
waiting for the main thread, so we make sure embed thread is always
signaled when quitting.
This commit is contained in:
Cheng Zhao 2013-11-11 16:57:40 +08:00
parent 01dd5638d0
commit d5ffa4dc77
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/node_bindings.cc
View file

@ -39,10 +39,16 @@ NodeBindings::NodeBindings(bool is_browser)
} }
NodeBindings::~NodeBindings() { NodeBindings::~NodeBindings() {
// Clear uv. // Quit the embed thread.
embed_closed_ = true; embed_closed_ = true;
uv_sem_post(&embed_sem_);
WakeupEmbedThread(); WakeupEmbedThread();
// Wait for everything to be done.
uv_thread_join(&embed_thread_); uv_thread_join(&embed_thread_);
message_loop_->RunUntilIdle();
// Clear uv.
uv_sem_destroy(&embed_sem_); uv_sem_destroy(&embed_sem_);
uv_timer_stop(&idle_timer_); uv_timer_stop(&idle_timer_);
} }