1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

worker: release native Worker object earlier

Browse Source 
Destroy the `Worker` class earlier, because we don’t need access
to it once the thread has stopped and all resources have been
cleaned up.

PR-URL: https://github.com/nodejs/node/pull/26542
Fixes: https://github.com/nodejs/node/issues/26535
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Anna Henningsen 2019-03-09 12:37:06 +01:00 committed by Daniel Bevenius
parent 3753f9cd76
commit c51735fd2d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/node_worker.cc
View File

@ -136,6 +136,9 @@ Worker::Worker(Environment* env,
env->inspector_agent()->GetParentHandle(thread_id_, url); env->inspector_agent()->GetParentHandle(thread_id_, url);
#endif #endif
// Mark this Worker object as weak until we actually start the thread.
MakeWeak();
Debug(this, "Preparation for worker %llu finished", thread_id_); Debug(this, "Preparation for worker %llu finished", thread_id_);
} }
@ -412,14 +415,10 @@ void Worker::OnThreadStopped() {
Worker::~Worker() { Worker::~Worker() {
Mutex::ScopedLock lock(mutex_); Mutex::ScopedLock lock(mutex_);
JoinThread();
CHECK(thread_stopper_.IsStopped()); CHECK(thread_stopper_.IsStopped());
CHECK(thread_joined_); CHECK(thread_joined_);
// This has most likely already happened within the worker thread -- this
// is just in case Worker creation failed early.
Debug(this, "Worker %llu destroyed", thread_id_); Debug(this, "Worker %llu destroyed", thread_id_);
} }
@ -509,6 +508,10 @@ void Worker::StartThread(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&w, args.This()); ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
Mutex::ScopedLock lock(w->mutex_); Mutex::ScopedLock lock(w->mutex_);
// The object now owns the created thread and should not be garbage collected
// until that finishes.
w->ClearWeak();
w->env()->add_sub_worker_context(w); w->env()->add_sub_worker_context(w);
w->thread_joined_ = false; w->thread_joined_ = false;
w->thread_stopper_.SetStopped(false); w->thread_stopper_.SetStopped(false);
@ -518,6 +521,7 @@ void Worker::StartThread(const FunctionCallbackInfo<Value>& args) {
CHECK(w_->thread_stopper_.IsStopped()); CHECK(w_->thread_stopper_.IsStopped());
w_->parent_port_ = nullptr; w_->parent_port_ = nullptr;
w_->JoinThread(); w_->JoinThread();
delete w_;
}); });
uv_thread_options_t thread_options; uv_thread_options_t thread_options;
@ -545,6 +549,7 @@ void Worker::StopThread(const FunctionCallbackInfo<Value>& args) {
Debug(w, "Worker %llu is getting stopped by parent", w->thread_id_); Debug(w, "Worker %llu is getting stopped by parent", w->thread_id_);
w->Exit(1); w->Exit(1);
w->JoinThread(); w->JoinThread();
delete w;
} }
void Worker::Ref(const FunctionCallbackInfo<Value>& args) { void Worker::Ref(const FunctionCallbackInfo<Value>& args) {