src: register StreamBase while registering LibuvStreamWrap

This resolves this TODO - https://github.com/nodejs/node/blob/71071f896aa9696b5d36bb3bec1c7217e7420509/src/stream_wrap.cc#L111-L112. Signed-off-by: Darshan Sen <[email protected]> PR-URL: #43321 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Jul 18, 2022 · b045893 · b045893
1 parent 27eb409
commit b045893
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/stream_base.cc b/src/stream_base.cc
@@ -452,6 +452,10 @@ void StreamBase::AddMethods(Environment* env, Local<FunctionTemplate> t) {
 
 void StreamBase::RegisterExternalReferences(
     ExternalReferenceRegistry* registry) {
+  // This function is called by a single thread during start up, so it is safe
+  // to use a local static variable here.
+  static bool is_registered = false;
+  if (is_registered) return;
   registry->Register(GetFD);
   registry->Register(GetExternal);
   registry->Register(GetBytesRead);
@@ -471,6 +475,7 @@ void StreamBase::RegisterExternalReferences(
   registry->Register(
       BaseObject::InternalFieldSet<StreamBase::kOnReadFunctionField,
                                    &Value::IsFunction>);
+  is_registered = true;
 }
 
 void StreamBase::GetFD(const FunctionCallbackInfo<Value>& args) {

diff --git a/src/stream_wrap.cc b/src/stream_wrap.cc
@@ -108,8 +108,7 @@ void LibuvStreamWrap::RegisterExternalReferences(
   registry->Register(IsConstructCallCallback);
   registry->Register(GetWriteQueueSize);
   registry->Register(SetBlocking);
-  // TODO(joyee): StreamBase::RegisterExternalReferences() is called somewhere
-  // else but we may want to do it here too and guard it with a static flag.
+  StreamBase::RegisterExternalReferences(registry);
 }
 
 LibuvStreamWrap::LibuvStreamWrap(Environment* env,