Skip to content

Commit

Permalink
src: use std::optional for Worker thread id
Browse files Browse the repository at this point in the history
Refs: #41421

PR-URL: #41453
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
  • Loading branch information
addaleax authored and targos committed Jan 16, 2022
1 parent 106ef0c commit ec9071f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
20 changes: 11 additions & 9 deletions src/node_worker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,10 @@ bool Worker::CreateEnvMessagePort(Environment* env) {
}

void Worker::JoinThread() {
if (thread_joined_)
if (!tid_.has_value())
return;
CHECK_EQ(uv_thread_join(&tid_), 0);
thread_joined_ = true;
CHECK_EQ(uv_thread_join(&tid_.value()), 0);
tid_.reset();

env()->remove_sub_worker_context(this);

Expand All @@ -406,7 +406,7 @@ void Worker::JoinThread() {
MakeCallback(env()->onexit_string(), arraysize(args), args);
}

// If we get here, the !thread_joined_ condition at the top of the function
// If we get here, the tid_.has_value() condition at the top of the function
// implies that the thread was running. In that case, its final action will
// be to schedule a callback on the parent thread which will delete this
// object, so there's nothing more to do here.
Expand All @@ -417,7 +417,7 @@ Worker::~Worker() {

CHECK(stopped_);
CHECK_NULL(env_);
CHECK(thread_joined_);
CHECK(!tid_.has_value());

Debug(this, "Worker %llu destroyed", thread_id_.id);
}
Expand Down Expand Up @@ -598,7 +598,9 @@ void Worker::StartThread(const FunctionCallbackInfo<Value>& args) {
uv_thread_options_t thread_options;
thread_options.flags = UV_THREAD_HAS_STACK_SIZE;
thread_options.stack_size = w->stack_size_;
int ret = uv_thread_create_ex(&w->tid_, &thread_options, [](void* arg) {

uv_thread_t* tid = &w->tid_.emplace(); // Create uv_thread_t instance
int ret = uv_thread_create_ex(tid, &thread_options, [](void* arg) {
// XXX: This could become a std::unique_ptr, but that makes at least
// gcc 6.3 detect undefined behaviour when there shouldn't be any.
// gcc 7+ handles this well.
Expand All @@ -625,14 +627,14 @@ void Worker::StartThread(const FunctionCallbackInfo<Value>& args) {
// The object now owns the created thread and should not be garbage
// collected until that finishes.
w->ClearWeak();
w->thread_joined_ = false;

if (w->has_ref_)
w->env()->add_refs(1);

w->env()->add_sub_worker_context(w);
} else {
w->stopped_ = true;
w->tid_.reset();

char err_buf[128];
uv_err_name_r(ret, err_buf, sizeof(err_buf));
Expand All @@ -655,7 +657,7 @@ void Worker::StopThread(const FunctionCallbackInfo<Value>& args) {
void Worker::Ref(const FunctionCallbackInfo<Value>& args) {
Worker* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
if (!w->has_ref_ && !w->thread_joined_) {
if (!w->has_ref_ && w->tid_.has_value()) {
w->has_ref_ = true;
w->env()->add_refs(1);
}
Expand All @@ -664,7 +666,7 @@ void Worker::Ref(const FunctionCallbackInfo<Value>& args) {
void Worker::Unref(const FunctionCallbackInfo<Value>& args) {
Worker* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
if (w->has_ref_ && !w->thread_joined_) {
if (w->has_ref_ && w->tid_.has_value()) {
w->has_ref_ = false;
w->env()->add_refs(-1);
}
Expand Down
4 changes: 2 additions & 2 deletions src/node_worker.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include <optional>
#include <unordered_map>
#include "node_messaging.h"
#include "uv.h"
Expand Down Expand Up @@ -80,14 +81,13 @@ class Worker : public AsyncWrap {

MultiIsolatePlatform* platform_;
v8::Isolate* isolate_ = nullptr;
uv_thread_t tid_;
std::optional<uv_thread_t> tid_; // Set while the thread is running

std::unique_ptr<InspectorParentHandle> inspector_parent_handle_;

// This mutex protects access to all variables listed below it.
mutable Mutex mutex_;

bool thread_joined_ = true;
const char* custom_error_ = nullptr;
std::string custom_error_str_;
int exit_code_ = 0;
Expand Down

0 comments on commit ec9071f

Please sign in to comment.