perf_hooks: simplify bootstrap milestones

doc/api/perf_hooks.md

@@ -219,26 +219,6 @@ The high resolution millisecond timestamp at which the Node.js process
 completed bootstrapping. If bootstrapping has not yet finished, the property
 has the value of -1.
 
-### performanceNodeTiming.clusterSetupEnd
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which cluster processing ended. If
-cluster processing has not yet ended, the property has the value of -1.
-
-### performanceNodeTiming.clusterSetupStart
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which cluster processing started.
-If cluster processing has not yet started, the property has the value of -1.
-
 ### performanceNodeTiming.loopExit
 <!-- YAML
 added: v8.5.0
@@ -261,24 +241,6 @@ The high resolution millisecond timestamp at which the Node.js event loop
 started. If the event loop has not yet started (e.g., in the first tick of the
 main script), the property has the value of -1.
 
-### performanceNodeTiming.moduleLoadEnd
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which main module load ended.
-
-### performanceNodeTiming.moduleLoadStart
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which main module load started.
-
 ### performanceNodeTiming.nodeStart
 <!-- YAML
 added: v8.5.0
@@ -289,46 +251,6 @@ added: v8.5.0
 The high resolution millisecond timestamp at which the Node.js process was
 initialized.
 
-### performanceNodeTiming.preloadModuleLoadEnd
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which preload module load ended.
-
-### performanceNodeTiming.preloadModuleLoadStart
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which preload module load started.
-
-### performanceNodeTiming.thirdPartyMainEnd
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which third\_party\_main
-processing ended. If third\_party\_main processing has not yet ended, the
-property has the value of -1.
-
-### performanceNodeTiming.thirdPartyMainStart
-<!-- YAML
-added: v8.5.0
--->
-
-* {number}
-
-The high resolution millisecond timestamp at which third\_party\_main
-processing started. If third\_party\_main processing has not yet started, the
-property has the value of -1.
-
 ### performanceNodeTiming.v8Start
 <!-- YAML
 added: v8.5.0

lib/internal/bootstrap/node.js

@@ -68,14 +68,6 @@
     const perf = process.binding('performance');
     const {
       NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE,
-      NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_START,
-      NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_END,
-      NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_START,
-      NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_END,
-      NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START,
-      NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END,
-      NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START,
-      NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END
     } = perf.constants;
 
     _process.setup_hrtime(_hrtime);
@@ -174,6 +166,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,11 +180,8 @@
       // 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');
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_END);
       });
     } else if (process.argv[1] === 'inspect' || process.argv[1] === 'debug') {
       if (process.argv[1] === 'debug') {
@@ -200,13 +191,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.
@@ -215,45 +204,30 @@
       // channel. This needs to be done before any user code gets executed
       // (including preload modules).
       if (process.argv[1] && process.env.NODE_UNIQUE_ID) {
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_START);
         const cluster = NativeModule.require('cluster');
         cluster._setupWorker();
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_END);
         // Make sure it's not accidentally inherited by child processes.
         delete process.env.NODE_UNIQUE_ID;
       }
 
       if (process._eval != null && !process._forceRepl) {
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START);
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END);
         // User passed '-e' or '--eval' arguments to Node without '-i' or
         // '--interactive'.
-
-        perf.markMilestone(
-          NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START);
         preloadModules();
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END);
 
         const {
           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);
         // Make process.argv[1] into a full path.
         const path = NativeModule.require('path');
         process.argv[1] = path.resolve(process.argv[1]);
 
         const CJSModule = NativeModule.require('internal/modules/cjs/loader');
 
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END);
-        perf.markMilestone(
-          NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START);
         preloadModules();
-        perf.markMilestone(
-          NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END);
         // Check if user passed `-c` or `--check` arguments to Node.
         if (process._syntax_check_only != null) {
           const fs = NativeModule.require('fs');
@@ -263,16 +237,9 @@
           checkScriptSyntax(source, filename);
           process.exit(0);
         }
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE);
         CJSModule.runMain();
       } else {
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START);
-        perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END);
-        perf.markMilestone(
-          NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START);
         preloadModules();
-        perf.markMilestone(
-          NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END);
         // If -i or --interactive were passed, or stdin is a TTY.
         if (process._forceRepl || NativeModule.require('tty').isatty(0)) {
           // REPL
@@ -294,7 +261,6 @@
 
           if (process._eval != null) {
             // User passed '-e' or '--eval'
-            perf.markMilestone(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE);
             evalScript('[eval]');
           }
         } else {
@@ -311,14 +277,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() {

lib/perf_hooks.js

@@ -27,15 +27,7 @@ const {
   NODE_PERFORMANCE_MILESTONE_LOOP_START,
   NODE_PERFORMANCE_MILESTONE_LOOP_EXIT,
   NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE,
-  NODE_PERFORMANCE_MILESTONE_ENVIRONMENT,
-  NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_START,
-  NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_END,
-  NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_START,
-  NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_END,
-  NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START,
-  NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END,
-  NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START,
-  NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END
+  NODE_PERFORMANCE_MILESTONE_ENVIRONMENT
 } = constants;
 
 const { AsyncResource } = require('async_hooks');
@@ -192,43 +184,6 @@ class PerformanceNodeTiming {
     return getMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE);
   }
 
-  get thirdPartyMainStart() {
-    return getMilestoneTimestamp(
-      NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_START);
-  }
-
-  get thirdPartyMainEnd() {
-    return getMilestoneTimestamp(
-      NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_END);
-  }
-
-  get clusterSetupStart() {
-    return getMilestoneTimestamp(
-      NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_START);
-  }
-
-  get clusterSetupEnd() {
-    return getMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_END);
-  }
-
-  get moduleLoadStart() {
-    return getMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START);
-  }
-
-  get moduleLoadEnd() {
-    return getMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END);
-  }
-
-  get preloadModuleLoadStart() {
-    return getMilestoneTimestamp(
-      NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START);
-  }
-
-  get preloadModuleLoadEnd() {
-    return getMilestoneTimestamp(
-      NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END);
-  }
-
   [kInspect]() {
     return {
       name: 'node',

src/node_perf_common.h

@@ -24,15 +24,8 @@ extern uint64_t performance_v8_start;
   V(V8_START, "v8Start")                                                      \
   V(LOOP_START, "loopStart")                                                  \
   V(LOOP_EXIT, "loopExit")                                                    \
-  V(BOOTSTRAP_COMPLETE, "bootstrapComplete")                                  \
-  V(THIRD_PARTY_MAIN_START, "thirdPartyMainStart")                            \
-  V(THIRD_PARTY_MAIN_END, "thirdPartyMainEnd")                                \
-  V(CLUSTER_SETUP_START, "clusterSetupStart")                                 \
-  V(CLUSTER_SETUP_END, "clusterSetupEnd")                                     \
-  V(MODULE_LOAD_START, "moduleLoadStart")                                     \
-  V(MODULE_LOAD_END, "moduleLoadEnd")                                         \
-  V(PRELOAD_MODULE_LOAD_START, "preloadModulesLoadStart")                     \
-  V(PRELOAD_MODULE_LOAD_END, "preloadModulesLoadEnd")
+  V(BOOTSTRAP_COMPLETE, "bootstrapComplete")
+
 
 #define NODE_PERFORMANCE_ENTRY_TYPES(V)                                       \
   V(NODE, "node")                                                             \

test/sequential/test-performance.js

@@ -80,15 +80,7 @@ checkNodeTiming({
   bootstrapComplete: { around: inited },
   environment: { around: 0 },
   loopStart: -1,
-  loopExit: -1,
-  thirdPartyMainStart: -1,
-  thirdPartyMainEnd: -1,
-  clusterSetupStart: -1,
-  clusterSetupEnd: -1,
-  moduleLoadStart: { around: inited },
-  moduleLoadEnd: { around: inited },
-  preloadModuleLoadStart: { around: inited },
-  preloadModuleLoadEnd: { around: inited },
+  loopExit: -1
 });
 
 setTimeout(() => {
@@ -102,15 +94,7 @@ setTimeout(() => {
     bootstrapComplete: { around: inited },
     environment: { around: 0 },
     loopStart: { around: inited },
-    loopExit: -1,
-    thirdPartyMainStart: -1,
-    thirdPartyMainEnd: -1,
-    clusterSetupStart: -1,
-    clusterSetupEnd: -1,
-    moduleLoadStart: { around: inited },
-    moduleLoadEnd: { around: inited },
-    preloadModuleLoadStart: { around: inited },
-    preloadModuleLoadEnd: { around: inited },
+    loopExit: -1
   });
 }, 2000);
 
@@ -125,14 +109,6 @@ process.on('exit', () => {
     bootstrapComplete: { around: inited },
     environment: { around: 0 },
     loopStart: { around: inited },
-    loopExit: { around: performance.now() },
-    thirdPartyMainStart: -1,
-    thirdPartyMainEnd: -1,
-    clusterSetupStart: -1,
-    clusterSetupEnd: -1,
-    moduleLoadStart: { around: inited },
-    moduleLoadEnd: { around: inited },
-    preloadModuleLoadStart: { around: inited },
-    preloadModuleLoadEnd: { around: inited },
+    loopExit: { around: performance.now() }
   });
 });