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

src: implement runtime option --no-node-snapshot for debugging

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/28567
Refs: https://github.com/nodejs/node/issues/28558
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Joyee Cheung 2019-07-06 02:43:27 +08:00
parent db55c3cfc1
commit 581bddc656
No known key found for this signature in database
GPG Key ID: 92B78A53C8303B8D
5 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/node.cc
View File

@ -1052,16 +1052,21 @@ int Start(int argc, char** argv) {
{ {
Isolate::CreateParams params; Isolate::CreateParams params;
// TODO(joyeecheung): collect external references and set it in const std::vector<size_t>* indexes = nullptr;
// params.external_references. std::vector<intptr_t> external_references;
std::vector<intptr_t> external_references = {
reinterpret_cast<intptr_t>(nullptr)}; bool force_no_snapshot =
v8::StartupData* blob = NodeMainInstance::GetEmbeddedSnapshotBlob(); per_process::cli_options->per_isolate->no_node_snapshot;
const std::vector<size_t>* indexes = if (!force_no_snapshot) {
NodeMainInstance::GetIsolateDataIndexes(); v8::StartupData* blob = NodeMainInstance::GetEmbeddedSnapshotBlob();
if (blob != nullptr) { if (blob != nullptr) {
params.external_references = external_references.data(); // TODO(joyeecheung): collect external references and set it in
params.snapshot_blob = blob; // params.external_references.
external_references.push_back(reinterpret_cast<intptr_t>(nullptr));
params.external_references = external_references.data();
params.snapshot_blob = blob;
indexes = NodeMainInstance::GetIsolateDataIndexes();
}
} }
NodeMainInstance main_instance(&params, NodeMainInstance main_instance(&params,

4
src/node_options.cc
View File

@ -522,6 +522,10 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
"track heap object allocations for heap snapshots", "track heap object allocations for heap snapshots",
&PerIsolateOptions::track_heap_objects, &PerIsolateOptions::track_heap_objects,
kAllowedInEnvironment); kAllowedInEnvironment);
AddOption("--no-node-snapshot",
"", // It's a debug-only option.
&PerIsolateOptions::no_node_snapshot,
kAllowedInEnvironment);
// Explicitly add some V8 flags to mark them as allowed in NODE_OPTIONS. // Explicitly add some V8 flags to mark them as allowed in NODE_OPTIONS.
AddOption("--abort-on-uncaught-exception", AddOption("--abort-on-uncaught-exception",

1
src/node_options.h
View File

@ -171,6 +171,7 @@ class PerIsolateOptions : public Options {
public: public:
std::shared_ptr<EnvironmentOptions> per_env { new EnvironmentOptions() }; std::shared_ptr<EnvironmentOptions> per_env { new EnvironmentOptions() };
bool track_heap_objects = false; bool track_heap_objects = false;
bool no_node_snapshot = false;
#ifdef NODE_REPORT #ifdef NODE_REPORT
bool report_uncaught_exception = false; bool report_uncaught_exception = false;

5
test/parallel/test-no-node-snapshot.js Normal file
View File

@ -0,0 +1,5 @@
'use strict';
// Flags: --no-node-snapshot
require('../common');

2
test/parallel/test-process-env-allowed-flags-are-documented.js
View File

@ -79,6 +79,8 @@ const undocumented = difference(process.allowedNodeEnvironmentFlags,
// Remove intentionally undocumented options. // Remove intentionally undocumented options.
assert(undocumented.delete('--debug-arraybuffer-allocations')); assert(undocumented.delete('--debug-arraybuffer-allocations'));
assert(undocumented.delete('--experimental-worker')); assert(undocumented.delete('--experimental-worker'));
assert(undocumented.delete('--no-node-snapshot'));
assert.strictEqual(undocumented.size, 0, assert.strictEqual(undocumented.size, 0,
'The following options are not documented as allowed in ' + 'The following options are not documented as allowed in ' +
`NODE_OPTIONS in ${cliMd}: ${[...undocumented].join(' ')}`); `NODE_OPTIONS in ${cliMd}: ${[...undocumented].join(' ')}`);