From 9460a298a744753ec16d42bb323f9896f139ca72 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Sun, 3 Jun 2018 16:30:15 -0700
Subject: [PATCH 1/3] perf_hooks: set bootstrap complete in only one place

---
 lib/internal/bootstrap/node.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 4817ec110a99e5..7b836b466f5d9c 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() {

From 304b1ebf338443b375853b040bc91f1d5b583902 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Sun, 3 Jun 2018 16:58:48 -0700
Subject: [PATCH 2/3] perf_hooks: remove less useful bootstrap marks

While `perf_hooks` is still in experimental, remove less useful
bootstrap milestones.
---
 doc/api/perf_hooks.md               | 80 +----------------------------
 lib/internal/bootstrap/node.js      | 30 -----------
 lib/perf_hooks.js                   | 47 +----------------
 src/node_perf_common.h              | 11 +---
 test/sequential/test-performance.js | 30 ++---------
 5 files changed, 7 insertions(+), 191 deletions(-)

diff --git a/doc/api/perf_hooks.md b/doc/api/perf_hooks.md
index a8c6bcf7378837..ecc71b4919848d 100644
--- a/doc/api/perf_hooks.md
+++ b/doc/api/perf_hooks.md
@@ -23,7 +23,7 @@ doSomeLongRunningProcess(() => {
   performance.mark('B');
   performance.measure('A to B', 'A', 'B');
 });
-```
+`````
 
 ## Class: Performance
 <!-- YAML
@@ -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
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 7b836b466f5d9c..a1162d384a1215 100644
--- a/lib/internal/bootstrap/node.js
+++ b/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);
@@ -189,9 +181,7 @@
       // one to drop a file lib/_third_party_main.js into the build
       // directory which will be executed instead of Node's normal loading.
       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') {
@@ -214,24 +204,16 @@
       // 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
@@ -239,19 +221,13 @@
         addBuiltinLibsToObject(global);
         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,13 +239,7 @@
         }
         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
diff --git a/lib/perf_hooks.js b/lib/perf_hooks.js
index 9080cc7f26ca29..f7b18816e6ceb0 100644
--- a/lib/perf_hooks.js
+++ b/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',
diff --git a/src/node_perf_common.h b/src/node_perf_common.h
index 9754e1e66f3a51..8f90c93060dc4c 100644
--- a/src/node_perf_common.h
+++ b/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")                                                             \
diff --git a/test/sequential/test-performance.js b/test/sequential/test-performance.js
index fdadb0be14ae5d..95a401c5c89a16 100644
--- a/test/sequential/test-performance.js
+++ b/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() }
   });
 });

From f660e60e9c40339aa3f97eeb049b044a58f623d7 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Sun, 10 Jun 2018 17:16:32 -0500
Subject: [PATCH 3/3] [Squash] nit

---
 doc/api/perf_hooks.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/perf_hooks.md b/doc/api/perf_hooks.md
index ecc71b4919848d..f16a217bbea6ef 100644
--- a/doc/api/perf_hooks.md
+++ b/doc/api/perf_hooks.md
@@ -23,7 +23,7 @@ doSomeLongRunningProcess(() => {
   performance.mark('B');
   performance.measure('A to B', 'A', 'B');
 });
-`````
+```
 
 ## Class: Performance
 <!-- YAML