Updating frame timing data structure and added pruning of old data

Author: markgalvan-intel

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.cpp

@@ -1313,10 +1313,10 @@ static void ReportMetrics(
             SetActiveGraphicsAdapter(*devId);
         }
 
-        SimTrackingData appProvidedSimTrackingData{};
-        auto iter = appSimTrackingData.find(processId);
-        if (iter != appSimTrackingData.end()) {
-            appProvidedSimTrackingData = iter->second;
+        FrameTimingData currentFrameTimingData{};
+        auto iter = frameTimingData.find(processId);
+        if (iter != frameTimingData.end()) {
+            currentFrameTimingData = iter->second;
         }
 
         FakePMTraceSession pmSession;
@@ -1326,7 +1326,7 @@ static void ReportMetrics(
         PM_FRAME_QUERY::Context ctx{ 
             nsm_hdr->start_qpc,
             pShmClient->GetQpcFrequency().QuadPart,
-            appProvidedSimTrackingData };
+            currentFrameTimingData };
 
         while (frames_copied < frames_to_copy) {
             const PmNsmFrameData* pCurrentFrameData = nullptr;
@@ -1410,7 +1410,16 @@ static void ReportMetrics(
         }
         // Set to the actual number of frames copied
         numFrames = frames_copied;
-        appSimTrackingData[processId] = ctx.appProvidedSimTrackingData;
+        // Trim off any old flip delay data that resides in the FrameTimingData::flipDelayDataMap map
+        // that is older than the last displayed frame id.
+        for (auto it = ctx.frameTimingData.flipDelayDataMap.begin(); it != ctx.frameTimingData.flipDelayDataMap.end();) {
+            if (it->first < ctx.frameTimingData.lastDisplayedFrameId) {
+                it = ctx.frameTimingData.flipDelayDataMap.erase(it); // Erase and move to the next element
+            } else {
+                ++it; // Move to the next element
+            }
+        }
+        frameTimingData[processId] = ctx.frameTimingData;
     }
 
     void ConcreteMiddleware::CalculateFpsMetric(fpsSwapChainData& swapChain, const PM_QUERY_ELEMENT& element, uint8_t* pBlob, LARGE_INTEGER qpcFrequency)

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.h

@@ -8,7 +8,7 @@
 #include <queue>
 #include "../CommonUtilities/Hash.h"
 #include "../CommonUtilities/Math.h"
-#include "AppProvidedData.h"
+#include "FrameTimingData.h"
 
 namespace pmapi::intro
 {
@@ -212,8 +212,8 @@ namespace pmon::mid
 		uint32_t clientProcessId = 0;
 		// Stream clients mapping to process id
 		std::map<uint32_t, std::unique_ptr<StreamClient>> presentMonStreamClients;
-		// App provided simulation timing data for each process id
-		std::map<uint32_t, SimTrackingData> appSimTrackingData;
+		// Frame timing data for each process id
+		std::map<uint32_t, FrameTimingData> frameTimingData;
 		std::unique_ptr<ipc::MiddlewareComms> pComms;
 		// Dynamic query handle to frame data delta
 		std::unordered_map<std::pair<const PM_DYNAMIC_QUERY*, uint32_t>, uint64_t> queryFrameDataDeltas;

IntelPresentMon/PresentMonMiddleware/FrameEventQuery.cpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <span>
 #include <memory>
-#include "AppProvidedData.h"
+#include "FrameTimingData.h"
 
 namespace pmapi::intro
 {
@@ -23,9 +23,9 @@ struct PM_FRAME_QUERY
 	struct Context
 	{
 		// functions
-		Context(uint64_t qpcStart, long long perfCounterFrequency, SimTrackingData& appProvidedSimTrackingData) : qpcStart{ qpcStart },
+		Context(uint64_t qpcStart, long long perfCounterFrequency, FrameTimingData& frameTimingData) : qpcStart{ qpcStart },
 			performanceCounterPeriodMs{ perfCounterFrequency != 0.f ? 1000.0 / perfCounterFrequency : 0.f },
-			appProvidedSimTrackingData{ appProvidedSimTrackingData } {}
+			frameTimingData{ frameTimingData } {}
 		void UpdateSourceData(const PmNsmFrameData* pSourceFrameData_in,
 			const PmNsmFrameData* pFrameDataOfNextDisplayed,
 			const PmNsmFrameData* pFrameDataofLastPresented,
@@ -60,7 +60,7 @@ struct PM_FRAME_QUERY
 		uint64_t mLastReceivedNotDisplayedPclSimStart = 0;
 		// QPC of the last PC Latency pc input
 		uint64_t mLastReceivedNotDisplayedPclInputTime = 0;
-        SimTrackingData appProvidedSimTrackingData{};
+        FrameTimingData frameTimingData{};
 
 		// Accumlated input to frame start time
 		double mAccumulatedInput2FrameStartTime = 0.f;

IntelPresentMon/PresentMonMiddleware/FrameEventQuery.h

@@ -12,7 +12,7 @@ struct FlipDelayData {
 	uint64_t displayQpc = 0;
 };
 
-struct SimTrackingData {
+struct FrameTimingData {
 	// QPC of the very first AppSimStartTime. This will either be from
 	// the app provider or the PCL simulation start time.
 	uint64_t firstAppSimStartTime = 0;
@@ -29,4 +29,5 @@ struct SimTrackingData {
 	AnimationErrorSource animationErrorSource = AnimationErrorSource::CpuStart;
 	// NVIDIA Flip Delay related data
 	std::unordered_map<uint32_t, FlipDelayData> flipDelayDataMap{};
+    uint32_t lastDisplayedFrameId = 0;
 };

IntelPresentMon/PresentMonMiddleware/AppProvidedData.h renamed to IntelPresentMon/PresentMonMiddleware/FrameTimingData.h

@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ActionClient.h" />
-    <ClInclude Include="AppProvidedData.h" />
+    <ClInclude Include="FrameTimingData.h" />
     <ClInclude Include="ConcreteMiddleware.h" />
     <ClInclude Include="DynamicQuery.h" />
     <ClInclude Include="FrameEventQuery.h" />

IntelPresentMon/PresentMonMiddleware/PresentMonMiddleware.vcxproj

@@ -36,7 +36,7 @@
     <ClInclude Include="ActionClient.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AppProvidedData.h">
+    <ClInclude Include="FrameTimingData.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>