Skip to content

src: make BuiltinLoader threadsafe and non-global #45942

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.

Sign up for GitHub

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

Merged
nodejs-github-bot merged 11 commits into from
Jan 18, 2023
Merged

src: make BuiltinLoader threadsafe and non-global #45942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be7dcba
src: make BuiltinLoader threadsafe and non-global
addaleax Dec 22, 2022
2d3190c
fixup! src: make BuiltinLoader threadsafe and non-global
addaleax Jan 6, 2023
1bfd5ac
fixup! fixup! src: make BuiltinLoader threadsafe and non-global
addaleax Jan 6, 2023
d015622
fixup! fixup! fixup! src: make BuiltinLoader threadsafe and non-global
addaleax Jan 10, 2023
93e411a
fixup! fixup! fixup! fixup! src: make BuiltinLoader threadsafe and no…
addaleax Jan 11, 2023
ed986f9
fixup! fixup! fixup! fixup! fixup! src: make BuiltinLoader threadsafe…
addaleax Jan 17, 2023
fcdb475
fixup! fixup! fixup! fixup! fixup! fixup! src: make BuiltinLoader thr…
addaleax Jan 17, 2023
278a570
fixup! fixup! fixup! fixup! fixup! fixup! fixup! src: make BuiltinLoa…
addaleax Jan 18, 2023
cedd64a
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! src: make Bui…
addaleax Jan 18, 2023
2c2084c
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! src: m…
addaleax Jan 18, 2023
492ede9
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup!…
addaleax Jan 18, 2023
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
Prev Previous commit
Next Next commit
fixup! fixup! fixup! fixup! fixup! src: make BuiltinLoader threadsafe… 
… and non-global
  • Loading branch information
@addaleax
addaleax committed Jan 17, 2023
commit ed986f9a84ea04b70abf741d59cd3a0f0759b60c
7 changes: 6 additions & 1 deletion src/api/environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,12 @@ Maybe<bool> InitializePrimordials(Local<Context> context) {
"internal/per_context/messageport",
nullptr};

auto builtin_loader = builtins::BuiltinLoader::Create();
// We do not have access to a per-Environment BuiltinLoader instance
// at this point, because this code runs before an Environment exists
// in the first place. However, creating BuiltinLoader instances is
// relatively cheap and all the scripts that we may want to run at
// startup are always present in it.
thread_local auto builtin_loader = builtins::BuiltinLoader::Create();
for (const char** module = context_files; *module != nullptr; module++) {
Local<Value> arguments[] = {exports, primordials};
if (builtin_loader
Expand Down
1 change: 0 additions & 1 deletion src/node_builtins.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@ void BuiltinLoader::GetBuiltinCategories(
Local<Context> context = env->context();
Local<Object> result = Object::New(isolate);

// Copy from the per-process categories
std::set<std::string> cannot_be_required =
env->builtin_loader()->GetCannotBeRequired();
std::set<std::string> can_be_required =
Expand Down