GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — src: remove loop_init_failed_ from Worker class · nodejs/node@4df3ac2

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- node_worker.cc
- node_worker.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/node_worker.cc‎`

Copy file name to clipboardExpand all lines: src/node_worker.cc

+7-4Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -140,10 +140,10 @@ class WorkerThreadData {`
`140`	`140`	`uv_err_name_r(ret, err_buf, sizeof(err_buf));`
`141`	`141`	`w->custom_error_ = "ERR_WORKER_INIT_FAILED";`
`142`	`142`	`w->custom_error_str_ = err_buf;`
`143`		`- w->loop_init_failed_ = true;`
`144`	`143`	`w->stopped_ = true;`
`145`	`144`	`return;`
`146`	`145`	`}`
	`146`	`+ loop_init_failed_ = false;`
`147`	`147`
`148`	`148`	`std::shared_ptr<ArrayBufferAllocator> allocator =`
`149`	`149`	`ArrayBufferAllocator::Create();`
`@@ -199,6 +199,7 @@ class WorkerThreadData {`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`if (isolate != nullptr) {`
	`202`	`+ CHECK(!loop_init_failed_);`
`202`	`203`	`bool platform_finished = false;`
`203`	`204`
`204`	`205`	`isolate_data_.reset();`
`@@ -217,18 +218,20 @@ class WorkerThreadData {`
`217`	`218`
`218`	`219`	`// Wait until the platform has cleaned up all relevant resources.`
`219`	`220`	`while (!platform_finished) {`
`220`		`- CHECK(!w_->loop_init_failed_);`
`221`	`221`	`uv_run(&loop_, UV_RUN_ONCE);`
`222`	`222`	`}`
`223`	`223`	`}`
`224`		`- if (!w_->loop_init_failed_) {`
	`224`	`+ if (!loop_init_failed_) {`
`225`	`225`	`CheckedUvLoopClose(&loop_);`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
	`229`	`+ bool loop_is_usable() const { return !loop_init_failed_; }`
	`230`	`+`
`229`	`231`	`private:`
`230`	`232`	`Worker* const w_;`
`231`	`233`	`uv_loop_t loop_;`
	`234`	`+ bool loop_init_failed_ = true;`
`232`	`235`	`DeleteFnPtr<IsolateData, FreeIsolateData> isolate_data_;`
`233`	`236`
`234`	`237`	`friend class Worker;`
`@@ -258,7 +261,7 @@ void Worker::Run() {`
`258`	`261`
`259`	`262`	`WorkerThreadData data(this);`
`260`	`263`	`if (isolate_ == nullptr) return;`
`261`		`- CHECK(!data.w_->loop_init_failed_);`
	`264`	`+ CHECK(data.loop_is_usable());`
`262`	`265`
`263`	`266`	`Debug(this, "Starting worker with id %llu", thread_id_);`
`264`	`267`	`{`

Collapse file

`‎src/node_worker.h‎`

Copy file name to clipboardExpand all lines: src/node_worker.h

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ class Worker : public AsyncWrap {`
`86`	`86`	`bool thread_joined_ = true;`
`87`	`87`	`const char* custom_error_ = nullptr;`
`88`	`88`	`std::string custom_error_str_;`
`89`		`- bool loop_init_failed_ = false;`
`90`	`89`	`int exit_code_ = 0;`
`91`	`90`	`uint64_t thread_id_ = -1;`
`92`	`91`	`uintptr_t stack_base_ = 0;`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.