Expose a counter of number of live context pointers.

Also optimize away some setting of null/undefined as context

Author: szegedi

bindings/profilers/wall.cc

@@ -72,6 +72,27 @@ class SignalMutex {
   inline ~SignalMutex() { store(false); }
 };
 
+// This class is used to update the context count metric when it goes out of
+// scope.
+class ContextCountMetricUpdater {
+  uint32_t* fields_;
+  std::unordered_set<PersistentContextPtr*>& liveContextPtrs_;
+
+ public:
+  inline ContextCountMetricUpdater(
+      uint32_t* fields,
+      std::unordered_set<PersistentContextPtr*>& liveContextPtrs)
+      : fields_(fields), liveContextPtrs_(liveContextPtrs) {}
+
+  inline ~ContextCountMetricUpdater() {
+    std::atomic_store_explicit(
+        reinterpret_cast<std::atomic<uint32_t>*>(
+            &fields_[WallProfiler::Fields::kCPEDContextCount]),
+        liveContextPtrs_.size(),
+        std::memory_order_relaxed);
+  }
+};
+
 void SetContextPtr(ContextPtr& contextPtr,
                    Isolate* isolate,
                    Local<Value> value) {
@@ -673,6 +694,7 @@ void WallProfiler::Dispose(Isolate* isolate, bool removeFromMap) {
     node::RemoveEnvironmentCleanupHook(
         isolate, &WallProfiler::CleanupHook, isolate);
 
+    ContextCountMetricUpdater updater(fields_, liveContextPtrs_);
     for (auto ptr : liveContextPtrs_) {
       ptr->UnregisterFromGC();
       delete ptr;
@@ -853,6 +875,7 @@ v8::ProfilerId WallProfiler::StartInternal() {
   if (withContexts_ || workaroundV8Bug_) {
     SignalHandler::IncreaseUseCount();
     fields_[kSampleCount] = 0;
+    fields_[kCPEDContextCount] = 0;
   }
 
   if (collectCpuTime_) {
@@ -1072,6 +1095,11 @@ NAN_MODULE_INIT(WallProfiler::Init) {
                          Nan::New<Integer>(kSampleCount),
                          ReadOnlyDontDelete)
       .FromJust();
+  Nan::DefineOwnProperty(constants,
+                         Nan::New("kCPEDContextCount").ToLocalChecked(),
+                         Nan::New<Integer>(kCPEDContextCount),
+                         ReadOnlyDontDelete)
+      .FromJust();
   Nan::DefineOwnProperty(target,
                          Nan::New("constants").ToLocalChecked(),
                          constants,
@@ -1116,6 +1144,8 @@ void WallProfiler::SetContext(Isolate* isolate, Local<Value> value) {
     return;
   }
 
+  ContextCountMetricUpdater updater(fields_, liveContextPtrs_);
+
   // Clean up dead context pointers
   for (auto ptr : deadContextPtrs_) {
     liveContextPtrs_.erase(ptr);
@@ -1140,6 +1170,12 @@ void WallProfiler::SetContext(Isolate* isolate, Local<Value> value) {
   auto profData = maybeProfData.ToLocalChecked();
   SignalMutex m(setInProgress_);
   if (profData->IsUndefined()) {
+    if (value->IsNullOrUndefined()) {
+      // Don't go to the trouble of mutating the CPED for null or undefined as
+      // the absence of a sample context will be interpreted as undefined in
+      // GetContextPtr anyway.
+      return;
+    }
     contextPtr = new PersistentContextPtr(&deadContextPtrs_);
 
     auto external = External::New(isolate, contextPtr);

bindings/profilers/wall.hh

@@ -43,10 +43,9 @@ class PersistentContextPtr;
 class WallProfiler : public Nan::ObjectWrap {
  public:
   enum class CollectionMode { kNoCollect, kPassThrough, kCollectContexts };
+  enum Fields { kSampleCount, kCPEDContextCount, kFieldCount };
 
  private:
-  enum Fields { kSampleCount, kFieldCount };
-
   std::chrono::microseconds samplingPeriod_{0};
   v8::CpuProfiler* cpuProfiler_ = nullptr;
 

ts/src/time-profiler.ts

@@ -30,7 +30,7 @@ import {
 import {GenerateTimeLabelsFunction} from './v8-types';
 import {isMainThread} from 'worker_threads';
 
-const {kSampleCount} = profilerConstants;
+const {kSampleCount, kCPEDContextCount} = profilerConstants;
 
 const DEFAULT_INTERVAL_MICROS: Microseconds = 1000;
 const DEFAULT_DURATION_MILLIS: Milliseconds = 60000;
@@ -178,6 +178,7 @@ export function v8ProfilerStuckEventLoopDetected() {
 
 export const constants = {
   kSampleCount,
+  kCPEDContextCount,
   GARBAGE_COLLECTION_FUNCTION_NAME,
   NON_JS_THREADS_FUNCTION_NAME,
 };