Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2020-02-01 13:42:30 +0300
committerDaniel Bevenius <daniel.bevenius@gmail.com>2020-02-04 09:02:34 +0300
commit60de60a0ce21378c80353489759dc70f05156cc7 (patch)
treee8c9e18f555d44484a95b529db1a63eb5bba7e67 /src
parentee9e689df2dd219084820d1adb7a97d104726794 (diff)
src: remove unused `Worker::child_port_` member
This fixes a compiler warning introduced in 9225939528590f652e6. PR-URL: https://github.com/nodejs/node/pull/31599 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/node_worker.cc18
-rw-r--r--src/node_worker.h3
2 files changed, 5 insertions, 16 deletions
diff --git a/src/node_worker.cc b/src/node_worker.cc
index bb13b2004bc..d63549e6020 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -251,14 +251,6 @@ void Worker::Run() {
Isolate::DisallowJavascriptExecutionScope disallow_js(isolate_,
Isolate::DisallowJavascriptExecutionScope::THROW_ON_FAILURE);
- // Grab the parent-to-child channel and render is unusable.
- MessagePort* child_port;
- {
- Mutex::ScopedLock lock(mutex_);
- child_port = child_port_;
- child_port_ = nullptr;
- }
-
{
Context::Scope context_scope(env_->context());
{
@@ -394,13 +386,13 @@ void Worker::CreateEnvMessagePort(Environment* env) {
HandleScope handle_scope(isolate_);
Mutex::ScopedLock lock(mutex_);
// Set up the message channel for receiving messages in the child.
- child_port_ = MessagePort::New(env,
- env->context(),
- std::move(child_port_data_));
+ MessagePort* child_port = MessagePort::New(env,
+ env->context(),
+ std::move(child_port_data_));
// MessagePort::New() may return nullptr if execution is terminated
// within it.
- if (child_port_ != nullptr)
- env->set_message_port(child_port_->object(isolate_));
+ if (child_port != nullptr)
+ env->set_message_port(child_port->object(isolate_));
}
void Worker::JoinThread() {
diff --git a/src/node_worker.h b/src/node_worker.h
index 893e03db53f..744c31a9932 100644
--- a/src/node_worker.h
+++ b/src/node_worker.h
@@ -100,9 +100,6 @@ class Worker : public AsyncWrap {
std::unique_ptr<MessagePortData> child_port_data_;
std::shared_ptr<KVStore> env_vars_;
- // The child port is kept alive by the child Environment's persistent
- // handle to it, as long as that child Environment exists.
- MessagePort* child_port_ = nullptr;
// This is always kept alive because the JS object associated with the Worker
// instance refers to it via its [kPort] property.
MessagePort* parent_port_ = nullptr;