Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src: minor worker code cleanups #32562

Closed
wants to merge 2 commits into from
Closed

src: minor worker code cleanups #32562

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09d3469
src: clean up worker thread creation code
addaleax Mar 30, 2020
09003e3
src: remove loop_init_failed_ from Worker class
addaleax Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
src: remove loop_init_failed_ from Worker class 
There’s no reason for this to not be stored alongside the loop
data structure itself.
  • Loading branch information
@addaleax
addaleax committed Mar 30, 2020
commit 09003e3e952638d96ce41433989807593eba812a
11 changes: 7 additions & 4 deletions src/node_worker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ class WorkerThreadData {
uv_err_name_r(ret, err_buf, sizeof(err_buf));
w->custom_error_ = "ERR_WORKER_INIT_FAILED";
w->custom_error_str_ = err_buf;
w->loop_init_failed_ = true;
w->stopped_ = true;
return;
}
loop_init_failed_ = false;

std::shared_ptr<ArrayBufferAllocator> allocator =
ArrayBufferAllocator::Create();
Expand Down Expand Up @@ -194,6 +194,7 @@ class WorkerThreadData {
}

if (isolate != nullptr) {
CHECK(!loop_init_failed_);
bool platform_finished = false;

isolate_data_.reset();
Expand All @@ -212,18 +213,20 @@ class WorkerThreadData {

// Wait until the platform has cleaned up all relevant resources.
while (!platform_finished) {
CHECK(!w_->loop_init_failed_);
uv_run(&loop_, UV_RUN_ONCE);
}
}
if (!w_->loop_init_failed_) {
if (!loop_init_failed_) {
CheckedUvLoopClose(&loop_);
}
}

bool loop_is_usable() const { return !loop_init_failed_; }

private:
Worker* const w_;
uv_loop_t loop_;
bool loop_init_failed_ = true;
DeleteFnPtr<IsolateData, FreeIsolateData> isolate_data_;

friend class Worker;
Expand Down Expand Up @@ -253,7 +256,7 @@ void Worker::Run() {

WorkerThreadData data(this);
if (isolate_ == nullptr) return;
CHECK(!data.w_->loop_init_failed_);
CHECK(data.loop_is_usable());

Debug(this, "Starting worker with id %llu", thread_id_.id);
{
Expand Down
1 change: 0 additions & 1 deletion src/node_worker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class Worker : public AsyncWrap {
bool thread_joined_ = true;
const char* custom_error_ = nullptr;
std::string custom_error_str_;
bool loop_init_failed_ = false;
int exit_code_ = 0;
ThreadId thread_id_;
uintptr_t stack_base_ = 0;
Expand Down