1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src,lib: allow running multiple per-context files

Browse Source 
Create an `lib/internal/per_context/` directory that can
host multiple files which we execute for each context.

PR-URL: https://github.com/nodejs/node/pull/26497
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Anna Henningsen 2019-03-07 15:12:52 +01:00
parent 0752a18b88
commit 7e2088f773
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/internal/bootstrap/cache.js
View File

@ -20,10 +20,11 @@ const cannotBeRequired = [
'internal/test/binding', 'internal/test/binding',
'internal/bootstrap/context',
'internal/bootstrap/primordials', 'internal/bootstrap/primordials',
'internal/bootstrap/loaders', 'internal/bootstrap/loaders',
'internal/bootstrap/node' 'internal/bootstrap/node',
'internal/per_context/setup',
]; ];
// Skip modules that cannot be required when they are not // Skip modules that cannot be required when they are not

0
lib/internal/bootstrap/context.js → lib/internal/per_context/setup.js
View File

2
node.gyp
View File

@ -26,12 +26,12 @@
'node_lib_target_name%': 'node_lib', 'node_lib_target_name%': 'node_lib',
'node_intermediate_lib_type%': 'static_library', 'node_intermediate_lib_type%': 'static_library',
'library_files': [ 'library_files': [
'lib/internal/bootstrap/context.js',
'lib/internal/bootstrap/primordials.js', 'lib/internal/bootstrap/primordials.js',
'lib/internal/bootstrap/cache.js', 'lib/internal/bootstrap/cache.js',
'lib/internal/bootstrap/loaders.js', 'lib/internal/bootstrap/loaders.js',
'lib/internal/bootstrap/node.js', 'lib/internal/bootstrap/node.js',
'lib/internal/bootstrap/pre_execution.js', 'lib/internal/bootstrap/pre_execution.js',
'lib/internal/per_context/setup.js',
'lib/async_hooks.js', 'lib/async_hooks.js',
'lib/assert.js', 'lib/assert.js',
'lib/buffer.js', 'lib/buffer.js',

42
src/api/environment.cc
View File

@ -289,25 +289,33 @@ Local<Context> NewContext(Isolate* isolate,
True(isolate)); True(isolate));
{ {
// Run lib/internal/bootstrap/context.js // Run per-context JS files.
Context::Scope context_scope(context); Context::Scope context_scope(context);
std::vector<Local<String>> parameters = { static const char* context_files[] = {
FIXED_ONE_BYTE_STRING(isolate, "global")}; "internal/per_context/setup",
Local<Value> arguments[] = {context->Global()}; nullptr
MaybeLocal<Function> maybe_fn = };
per_process::native_module_loader.LookupAndCompile(
context, "internal/bootstrap/context", &parameters, nullptr); for (const char** module = context_files; *module != nullptr; module++) {
if (maybe_fn.IsEmpty()) { std::vector<Local<String>> parameters = {
return Local<Context>(); FIXED_ONE_BYTE_STRING(isolate, "global")};
} Local<Value> arguments[] = {context->Global()};
Local<Function> fn = maybe_fn.ToLocalChecked(); MaybeLocal<Function> maybe_fn =
MaybeLocal<Value> result = per_process::native_module_loader.LookupAndCompile(
fn->Call(context, Undefined(isolate), arraysize(arguments), arguments); context, *module, &parameters, nullptr);
// Execution failed during context creation. if (maybe_fn.IsEmpty()) {
// TODO(joyeecheung): deprecate this signature and return a MaybeLocal. return Local<Context>();
if (result.IsEmpty()) { }
return Local<Context>(); Local<Function> fn = maybe_fn.ToLocalChecked();
MaybeLocal<Value> result =
fn->Call(context, Undefined(isolate),
arraysize(arguments), arguments);
// Execution failed during context creation.
// TODO(joyeecheung): deprecate this signature and return a MaybeLocal.
if (result.IsEmpty()) {
return Local<Context>();
}
} }
} }