Adding new trace event to emit just the heap size & usage ratio. This will be used to drive perf track & diag track integration

Author: Mike Kaufman

lib/Common/Memory/RecyclerTelemetryInfo.cpp

@@ -24,6 +24,7 @@ namespace Memory
 
     RecyclerTelemetryInfo::RecyclerTelemetryInfo(Recycler * recycler, RecyclerTelemetryHostInterface* hostInterface) :
         passCount(0),
+        perfTrackPassCount(0),
         hostInterface(hostInterface),
         gcPassStats(&HeapAllocator::Instance),
         recyclerStartTime(Js::Tick::Now()),
@@ -41,7 +42,7 @@ namespace Memory
             AssertOnValidThread(this, RecyclerTelemetryInfo::~RecyclerTelemetryInfo);
             if (this->gcPassStats.Empty() == false)
             {
-                this->hostInterface->TransmitTelemetry(*this);
+                this->hostInterface->TransmitGCTelemetryStats(*this);
                 this->FreeGCPassStats();
             }
         }
@@ -147,6 +148,7 @@ namespace Memory
             {
                 this->inPassActiveState = true;
                 passCount++;
+                perfTrackPassCount++;
                 memset(stats, 0, sizeof(RecyclerTelemetryGCPassStats));
 
                 stats->startPassCollectionState = collectionState;
@@ -218,16 +220,30 @@ namespace Memory
 
         lastPassStats->endPassProcessingElapsedTime = Js::Tick::Now() - start;
 
-        if (ShouldTransmit() && this->hostInterface != nullptr)
+        // use separate events for perftrack specific data & general telemetry data
+        if (this->ShouldTransmitPerfTrackEvents())
         {
-            if (this->hostInterface->TransmitTelemetry(*this))
+            if (this->hostInterface->TransmitHeapUsage(bucketReporter.GetTotalStats()->totalByteCount, bucketReporter.GetTotalStats()->objectByteCount, bucketReporter.GetTotalStats()->UsedRatio()))
+            {
+                this->ResetPerfTrackCounts();
+            }
+        }
+
+        if (this->ShouldTransmitGCStats() && this->hostInterface != nullptr)
+        {
+            if (this->hostInterface->TransmitGCTelemetryStats(*this))
             {
                 this->lastTransmitTime = lastPassStats->passEndTimeTick;
                 Reset();
             }
         }
     }
 
+    void RecyclerTelemetryInfo::ResetPerfTrackCounts()
+    {
+        this->perfTrackPassCount = 0;
+    }
+
     void RecyclerTelemetryInfo::Reset()
     {
         FreeGCPassStats();
@@ -248,12 +264,19 @@ namespace Memory
         }
     }
 
-    bool RecyclerTelemetryInfo::ShouldTransmit() const
+    bool RecyclerTelemetryInfo::ShouldTransmitGCStats() const
     {
         // for now, try to transmit telemetry when we have >= 16
         return (this->hostInterface != nullptr &&  this->passCount >= 16);
     }
 
+    bool RecyclerTelemetryInfo::ShouldTransmitPerfTrackEvents() const
+    {
+        // for now, try to transmit telemetry when we have >= 16
+        return (this->hostInterface != nullptr &&  this->perfTrackPassCount >= 128);
+    }
+
+
     void RecyclerTelemetryInfo::IncrementUserThreadBlockedCount(Js::TickDelta waitTime, RecyclerWaitReason caller)
     {
         RecyclerTelemetryGCPassStats* lastPassStats = this->GetLastPassStats();

lib/Common/Memory/RecyclerTelemetryInfo.h

@@ -28,8 +28,9 @@ namespace Memory
     {
     public:
         virtual LPFILETIME GetLastScriptExecutionEndTime() const = 0;
-        virtual bool TransmitTelemetry(RecyclerTelemetryInfo& rti) = 0;
+        virtual bool TransmitGCTelemetryStats(RecyclerTelemetryInfo& rti) = 0;
         virtual bool TransmitTelemetryError(const RecyclerTelemetryInfo& rti, const char* msg) = 0;
+        virtual bool TransmitHeapUsage(size_t totalHeapBytes, size_t usedHeapBytes, double heapUsedRatio) = 0;
         virtual bool IsTelemetryProviderEnabled() const = 0;
         virtual bool IsThreadBound() const = 0;
         virtual DWORD GetCurrentScriptThreadID() const = 0;
@@ -151,6 +152,7 @@ namespace Memory
         GCPassStatsList gcPassStats;
         Js::Tick lastTransmitTime;
         uint16 passCount;
+        uint16 perfTrackPassCount;
         bool abortTelemetryCapture;
 
         AllocatorDecommitStats threadPageAllocator_decommitStats;
@@ -160,11 +162,14 @@ namespace Memory
         AllocatorDecommitStats recyclerWithBarrierPageAllocator_decommitStats;
 #endif
 
-        bool ShouldTransmit() const;
+        bool ShouldTransmitGCStats() const;
         void FreeGCPassStats();
         void Reset();
         void FillInSizeData(IdleDecommitPageAllocator* allocator, AllocatorSizes* sizes) const;
 
+        void ResetPerfTrackCounts();
+        bool ShouldTransmitPerfTrackEvents() const;
+
         static size_t GetProcessCommittedBytes();
     };
 #else

lib/Runtime/Base/ThreadContext.cpp

@@ -682,15 +682,23 @@ LPFILETIME ThreadContext::ThreadContextRecyclerTelemetryHostInterface::GetLastSc
 #endif
 }
 
-bool ThreadContext::ThreadContextRecyclerTelemetryHostInterface::TransmitTelemetry(RecyclerTelemetryInfo& rti)
+bool ThreadContext::ThreadContextRecyclerTelemetryHostInterface::TransmitGCTelemetryStats(RecyclerTelemetryInfo& rti)
 {
 #if defined(ENABLE_BASIC_TELEMETRY) && defined(NTBUILD)
-    return Js::TransmitRecyclerTelemetry(rti);
+    return Js::TransmitRecyclerTelemetryStats(rti);
 #else
     return false;
 #endif
 }
 
+bool ThreadContext::ThreadContextRecyclerTelemetryHostInterface::TransmitHeapUsage(size_t totalHeapBytes, size_t usedHeapBytes, double heapUsedRatio)
+{
+#if defined(ENABLE_BASIC_TELEMETRY) && defined(NTBUILD)
+    return Js::TransmitRecyclerHeapUsage(totalHeapBytes, usedHeapBytes, heapUsedRatio);
+#else
+    return false;
+#endif
+}
 
 bool ThreadContext::ThreadContextRecyclerTelemetryHostInterface::IsTelemetryProviderEnabled() const
 {

lib/Runtime/Base/ThreadContext.h

@@ -1882,8 +1882,9 @@ class ThreadContext sealed :
         }
 
         virtual LPFILETIME GetLastScriptExecutionEndTime() const;
-        virtual bool TransmitTelemetry(RecyclerTelemetryInfo& rti);
+        virtual bool TransmitGCTelemetryStats(RecyclerTelemetryInfo& rti);
         virtual bool TransmitTelemetryError(const RecyclerTelemetryInfo& rti, const char * msg);
+        virtual bool TransmitHeapUsage(size_t totalHeapBytes, size_t usedHeapBytes, double heapUsedRatio);
         virtual bool ThreadContextRecyclerTelemetryHostInterface::IsThreadBound() const;
         virtual DWORD ThreadContextRecyclerTelemetryHostInterface::GetCurrentScriptThreadID() const;
         virtual bool IsTelemetryProviderEnabled() const;