perf_hooks: return different timerified function when different histo…

…gram Fixes: nodejs#42742
himself65 · Apr 24, 2022 · f6dc051 · f6dc051
1 parent c4781ea
commit f6dc051
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 10 deletions.
diff --git a/deps/v8/src/logging/counters.h b/deps/v8/src/logging/counters.h
@@ -64,7 +64,7 @@ class StatsTable {
     return lookup_function_(name);
   }
 
-  // Create a histogram by name. If the create is successful,
+  // Create a histogram by name. If the creation is successful,
   // returns a non-nullptr pointer for use with AddHistogramSample
   // function. min and max define the expected minimum and maximum
   // sample values. buckets is the maximum number of buckets

diff --git a/lib/internal/histogram.js b/lib/internal/histogram.js
@@ -53,6 +53,30 @@ function isHistogram(object) {
   return object?.[kHandle] !== undefined;
 }
 
+function* infinite() {
+  let id = 0;
+
+  while (true) {
+    yield id++;
+  }
+}
+
+const idWeakMap = new WeakMap();
+const gen = infinite()
+
+function getHistogramID(object) {
+  if (object == null) {
+    return -1;
+  }
+  if (idWeakMap.has(object)) {
+    return idWeakMap.get(object);
+  } else {
+    const id = gen.next().value;
+    idWeakMap.set(object, id);
+    return id
+  }
+}
+
 class Histogram {
   constructor() {
     throw new ERR_ILLEGAL_CONSTRUCTOR();
@@ -377,6 +401,7 @@ module.exports = {
   internalHistogram,
   internalRecordableHistogram,
   isHistogram,
+  getHistogramID,
   kDestroy,
   kHandle,
   kMap,

diff --git a/lib/internal/perf/timerify.js b/lib/internal/perf/timerify.js
@@ -18,7 +18,8 @@ const {
 } = require('internal/validators');
 
 const {
-  isHistogram
+  isHistogram,
+  getHistogramID
 } = require('internal/histogram');
 
 const {
@@ -71,7 +72,9 @@ function timerify(fn, options = {}) {
       histogram);
   }
 
-  if (fn[kTimerified]) return fn[kTimerified];
+  const id = getHistogramID(histogram)
+
+  if (fn[kTimerified]?.[id]) return fn[kTimerified][id];
 
   const constructor = isConstructor(fn);
 
@@ -112,13 +115,19 @@ function timerify(fn, options = {}) {
     }
   });
 
-  ObjectDefineProperties(fn, {
-    [kTimerified]: {
-      configurable: false,
-      enumerable: false,
-      value: timerified,
-    }
-  });
+  if (fn[kTimerified]) {
+    fn[kTimerified][id] = timerified
+  } else {
+    ObjectDefineProperties(fn, {
+      [kTimerified]: {
+        configurable: false,
+        enumerable: false,
+        value: {
+          [id]: timerified
+        },
+      }
+    });
+  }
 
   return timerified;
 }