diff options
author | James M Snell <jasnell@gmail.com> | 2018-06-03 16:30:15 -0700 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2018-06-15 09:05:19 -0700 |
commit | 17e378b51a4e35533b43bae66e7aa76faaad17b3 (patch) | |
tree | 1cb812f1e4caba28489011188307f5c7ae589dd5 | |
parent | a703df9785b79987ca03a2ad66f13afcfa2e4ade (diff) | |
download | android-node-v8-17e378b51a4e35533b43bae66e7aa76faaad17b3.tar.gz android-node-v8-17e378b51a4e35533b43bae66e7aa76faaad17b3.tar.bz2 android-node-v8-17e378b51a4e35533b43bae66e7aa76faaad17b3.zip |
perf_hooks: set bootstrap complete in only one place
PR-URL: https://github.com/nodejs/node/pull/21247
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
-rw-r--r-- | lib/internal/bootstrap/node.js | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js index 4817ec110a..7b836b466f 100644 --- a/lib/internal/bootstrap/node.js +++ b/lib/internal/bootstrap/node.js @@ -174,6 +174,8 @@ } } + perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); + // There are various modes that Node can run in. The most common two // are running from a script and running the REPL - but there are a few // others like the debugger or running --eval arguments. Here we decide @@ -186,7 +188,6 @@ // To allow people to extend Node in different ways, this hook allows // one to drop a file lib/_third_party_main.js into the build // directory which will be executed instead of Node's normal loading. - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); process.nextTick(function() { perf.markMilestone(NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_START); NativeModule.require('_third_party_main'); @@ -200,13 +201,11 @@ } // Start the debugger agent. - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); process.nextTick(function() { NativeModule.require('internal/deps/node-inspect/lib/_inspect').start(); }); } else if (process.profProcess) { - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); NativeModule.require('internal/v8_prof_processor'); } else { // There is user code to be run. @@ -238,7 +237,6 @@ addBuiltinLibsToObject } = NativeModule.require('internal/modules/cjs/helpers'); addBuiltinLibsToObject(global); - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); evalScript('[eval]'); } else if (process.argv[1] && process.argv[1] !== '-') { perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START); @@ -263,7 +261,6 @@ checkScriptSyntax(source, filename); process.exit(0); } - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); CJSModule.runMain(); } else { perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START); @@ -294,7 +291,6 @@ if (process._eval != null) { // User passed '-e' or '--eval' - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); evalScript('[eval]'); } } else { @@ -311,14 +307,12 @@ checkScriptSyntax(code, '[stdin]'); } else { process._eval = code; - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); evalScript('[stdin]'); } }); } } } - perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE); } function setupProcessObject() { |