Skip to content

Commit

Permalink
src: register StreamBase while registering LibuvStreamWrap
Browse files Browse the repository at this point in the history
This resolves this TODO -
https://github.com/nodejs/node/blob/71071f896aa9696b5d36bb3bec1c7217e7420509/src/stream_wrap.cc#L111-L112.

Signed-off-by: Darshan Sen <raisinten@gmail.com>

PR-URL: #43321
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
RaisinTen authored and targos committed Jul 12, 2022
1 parent 2b55b60 commit 66ee1f1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 5 additions & 0 deletions src/stream_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand Down
3 changes: 1 addition & 2 deletions src/stream_wrap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 66ee1f1

Please sign in to comment.