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.

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: register StreamBase while registering LibuvStreamWrap #43321

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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;
RaisinTen marked this conversation as resolved.
Show resolved Hide resolved
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