perf_hooks: fix timing

Fixes: #17892Fixes: #17893Fixes: #18992
PR-URL: #18993
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>

Author: TimothyGu

doc/api/perf_hooks.md

@@ -181,7 +181,8 @@ added: v8.5.0
 
 * Returns: {number}
 
-Returns the current high resolution millisecond timestamp.
+Returns the current high resolution millisecond timestamp, where 0 represents
+the start of the current `node` process.
 
 ### performance.timeOrigin
 <!-- YAML
@@ -190,8 +191,8 @@ added: v8.5.0
 
 * {number}
 
-The [`timeOrigin`][] specifies the high resolution millisecond timestamp from
-which all performance metric durations are measured.
+The [`timeOrigin`][] specifies the high resolution millisecond timestamp at
+which the current `node` process began, measured in Unix time.
 
 ### performance.timerify(fn)
 <!-- YAML
@@ -302,7 +303,8 @@ added: v8.5.0
 * {number}
 
 The high resolution millisecond timestamp at which the Node.js process
-completed bootstrap.
+completed bootstrapping. If bootstrapping has not yet finished, the property
+has the value of -1.
 
 ### performanceNodeTiming.clusterSetupEnd
 <!-- YAML
@@ -311,7 +313,8 @@ added: v8.5.0
 
 * {number}
 
-The high resolution millisecond timestamp at which cluster processing ended.
+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
@@ -321,6 +324,7 @@ 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
@@ -330,7 +334,8 @@ added: v8.5.0
 * {number}
 
 The high resolution millisecond timestamp at which the Node.js event loop
-exited.
+exited. If the event loop has not yet exited, the property has the value of -1.
+It can only have a value of not -1 in a handler of the [`'exit'`][] event.
 
 ### performanceNodeTiming.loopStart
 <!-- YAML
@@ -340,7 +345,8 @@ added: v8.5.0
 * {number}
 
 The high resolution millisecond timestamp at which the Node.js event loop
-started.
+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
@@ -395,8 +401,9 @@ added: v8.5.0
 
 * {number}
 
-The high resolution millisecond timestamp at which third_party_main processing
-ended.
+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
@@ -405,8 +412,9 @@ added: v8.5.0
 
 * {number}
 
-The high resolution millisecond timestamp at which third_party_main processing
-started.
+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
@@ -642,6 +650,7 @@ obs.observe({ entryTypes: ['function'], buffered: true });
 require('some-module');
 ```
 
+[`'exit'`]: process.html#process_event_exit
 [`timeOrigin`]: https://w3c.github.io/hr-time/#dom-performance-timeorigin
 [Async Hooks]: async_hooks.html
 [W3C Performance Timeline]: https://w3c.github.io/performance-timeline/

lib/perf_hooks.js

@@ -8,6 +8,7 @@ const {
  observerCounts,
  setupObservers,
  timeOrigin,
+ timeOriginTimestamp,
  timerify,
  constants
 }=process.binding('performance');
@@ -145,6 +146,13 @@ function now() {
 returnhr[0]*1000+hr[1]/1e6;
 }
 
+functiongetMilestoneTimestamp(milestoneIdx){
+constns=milestones[milestoneIdx];
+if(ns===-1)
+returnns;
+returnns/1e6-timeOrigin;
+}
+
 classPerformanceNodeTiming{
 constructor(){}
 
@@ -157,67 +165,72 @@ class PerformanceNodeTiming {
 }
 
 getstartTime(){
-returntimeOrigin;
+return0;
 }
 
 getduration(){
 returnnow()-timeOrigin;
 }
 
 getnodeStart(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_NODE_START];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_NODE_START);
 }
 
 getv8Start(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_V8_START];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_V8_START);
 }
 
 getenvironment(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_ENVIRONMENT];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_ENVIRONMENT);
 }
 
 getloopStart(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_LOOP_START];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_LOOP_START);
 }
 
 getloopExit(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_LOOP_EXIT];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_LOOP_EXIT);
 }
 
 getbootstrapComplete(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_BOOTSTRAP_COMPLETE);
 }
 
 getthirdPartyMainStart(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_START];
+returngetMilestoneTimestamp(
+NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_START);
 }
 
 getthirdPartyMainEnd(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_END];
+returngetMilestoneTimestamp(
+NODE_PERFORMANCE_MILESTONE_THIRD_PARTY_MAIN_END);
 }
 
 getclusterSetupStart(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_START];
+returngetMilestoneTimestamp(
+NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_START);
 }
 
 getclusterSetupEnd(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_END];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_CLUSTER_SETUP_END);
 }
 
 getmoduleLoadStart(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START);
 }
 
 getmoduleLoadEnd(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END];
+returngetMilestoneTimestamp(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END);
 }
 
 getpreloadModuleLoadStart(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START];
+returngetMilestoneTimestamp(
+NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START);
 }
 
 getpreloadModuleLoadEnd(){
-returnmilestones[NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END];
+returngetMilestoneTimestamp(
+NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END);
 }
 
 [kInspect](){
@@ -466,11 +479,11 @@ class Performance extends PerformanceObserverEntryList {
 }
 
 gettimeOrigin(){
-returntimeOrigin;
+returntimeOriginTimestamp;
 }
 
 now(){
-returnnow();
+returnnow()-timeOrigin;
 }
 
 mark(name){
@@ -549,8 +562,9 @@ class Performance extends PerformanceObserverEntryList {
 
 [kInspect](){
 return{
- timeOrigin,
- nodeTiming
+maxEntries: this.maxEntries,
+nodeTiming: this.nodeTiming,
+timeOrigin: this.timeOrigin
 };
 }
 }

src/node_perf.cc

@@ -3,6 +3,10 @@
 
 #include<vector>
 
+#ifdef __POSIX__
+#include<sys/time.h>// gettimeofday
+#endif
+
 namespacenode {
 namespaceperformance {
 
@@ -21,13 +25,38 @@ using v8::Object;
 using v8::String;
 using v8::Value;
 
+// Microseconds in a second, as a float.
+#defineMICROS_PER_SEC1e6
+// Microseconds in a millisecond, as a float.
+#defineMICROS_PER_MILLIS1e3
+
+// https://w3c.github.io/hr-time/#dfn-time-origin
 constuint64_t timeOrigin = PERFORMANCE_NOW();
+// https://w3c.github.io/hr-time/#dfn-time-origin-timestamp
+constdouble timeOriginTimestamp = GetCurrentTimeInMicroseconds();
 uint64_t performance_node_start;
 uint64_t performance_v8_start;
 
 uint64_t performance_last_gc_start_mark_ = 0;
 v8::GCType performance_last_gc_type_ = v8::GCType::kGCTypeAll;
 
+doubleGetCurrentTimeInMicroseconds() {
+#ifdef _WIN32
+// The difference between the Unix Epoch and the Windows Epoch in 100-ns ticks.
+#defineTICKS_TO_UNIX_EPOCH116444736000000000LL
+FILETIME ft;
+GetSystemTimeAsFileTime(&ft);
+uint64_t filetime_int = static_cast<uint64_t>(ft.dwHighDateTime) << 32 |
+ ft.dwLowDateTime;
+// FILETIME is measured in terms of 100 ns. Convert that to 1 us (1000 ns).
+return (filetime_int - TICKS_TO_UNIX_EPOCH) / 10.;
+#else
+structtimeval tp;
+gettimeofday(&tp, nullptr);
+returnMICROS_PER_SEC * tp.tv_sec + tp.tv_usec;
+#endif
+}
+
 // Initialize the performance entry object properties
 inlinevoidInitObject(const PerformanceEntry& entry, Local<Object> obj) {
  Environment* env = entry.env();
@@ -372,6 +401,12 @@ void Init(Local<Object> target,
 v8::Number::New(isolate, timeOrigin / 1e6),
  attr).ToChecked();
 
+ target->DefineOwnProperty(
+ context,
+FIXED_ONE_BYTE_STRING(isolate, "timeOriginTimestamp"),
+v8::Number::New(isolate, timeOriginTimestamp / MICROS_PER_MILLIS),
+ attr).ToChecked();
+
  target->DefineOwnProperty(context,
  env->constants_string(),
  constants,

src/node_perf.h

@@ -22,6 +22,10 @@ using v8::Local;
 using v8::Object;
 using v8::Value;
 
+externconstuint64_t timeOrigin;
+
+doubleGetCurrentTimeInMicroseconds();
+
 staticinline PerformanceMilestone ToPerformanceMilestoneEnum(constchar* str) {
 #defineV(name, label) \
 if (strcmp(str, label) == 0) returnNODE_PERFORMANCE_MILESTONE_##name;
@@ -77,11 +81,11 @@ class PerformanceEntry {
 returnToPerformanceEntryTypeEnum(type().c_str());
  }
 
-doublestartTime() const { returnstartTime_ / 1e6; }
+doublestartTime() const { returnstartTimeNano() / 1e6; }
 
 doubleduration() const { returndurationNano() / 1e6; }
 
-uint64_tstartTimeNano() const { return startTime_; }
+uint64_tstartTimeNano() const { return startTime_ - timeOrigin; }
 
 uint64_tdurationNano() const { return endTime_ - startTime_; }
 

src/node_perf_common.h

@@ -4,6 +4,7 @@
 #include"node.h"
 #include"v8.h"
 
+#include<algorithm>
 #include<map>
 #include<string>
 
@@ -76,7 +77,10 @@ class performance_state {
  isolate,
 offsetof(performance_state_internal, observers),
  NODE_PERFORMANCE_ENTRY_TYPE_INVALID,
- root) {}
+ root) {
+for (size_t i = 0; i < milestones.Length(); i++)
+ milestones[i] = -1.;
+ }
 
  AliasedBuffer<uint8_t, v8::Uint8Array> root;
  AliasedBuffer<double, v8::Float64Array> milestones;