ExtendedTools: Fix crash (thanks to JustMagic for debugging) also remove unused lost fps events

Author: dmex

plugins/ExtendedTools/PresentMon/PresentMon.cpp

@@ -165,11 +165,11 @@ static void PruneHistory(
 
 static void ProcessEvents(
     std::vector<std::shared_ptr<PresentEvent>>* presentEvents,
-    std::vector<std::shared_ptr<PresentEvent>>* lostPresentEvents,
+    //std::vector<std::shared_ptr<PresentEvent>>* lostPresentEvents,
     std::vector<std::pair<ULONG, ULONGLONG>>* terminatedProcesses)
 {
     // Copy any analyzed information from ConsumerThread and early-out if there isn't any.
-    DequeueAnalyzedInfo(presentEvents, lostPresentEvents);
+    DequeueAnalyzedInfo(presentEvents); // lostPresentEvents
 
     if (presentEvents->empty())
     {
@@ -231,7 +231,7 @@ static void ProcessEvents(
 
     // Clear events processed.
     presentEvents->clear();
-    lostPresentEvents->clear();
+    //lostPresentEvents->clear();
 
     if (terminatedProcessIndex > 0)
     {
@@ -366,7 +366,7 @@ NTSTATUS PresentMonOutputThread(
     )
 {
     std::vector<std::shared_ptr<PresentEvent>> presentEvents;
-    std::vector<std::shared_ptr<PresentEvent>> lostPresentEvents;
+    //std::vector<std::shared_ptr<PresentEvent>> lostPresentEvents;
     std::vector<std::pair<ULONG, ULONGLONG>> terminatedProcesses;
     presentEvents.reserve(4096);
     terminatedProcesses.reserve(16);
@@ -377,7 +377,7 @@ NTSTATUS PresentMonOutputThread(
             break;
 
         // Copy and process all the collected events, and update the various tracking and statistics data structures.
-        ProcessEvents(&presentEvents, &lostPresentEvents, &terminatedProcesses);
+        ProcessEvents(&presentEvents, &terminatedProcesses); // lostPresentEvents
 
         EtLockGpuFrameHashTable();
         EtClearGpuFrameHashTable();

plugins/ExtendedTools/PresentMon/PresentMon.hpp

@@ -56,7 +56,7 @@ VOID StartOutputThread(VOID);
 VOID StopOutputThread(VOID);
 
 // TraceSession.cpp:
-VOID DequeueAnalyzedInfo(std::vector<std::shared_ptr<PresentEvent>>* presentEvents, std::vector<std::shared_ptr<PresentEvent>>* lostPresentEvents);
+VOID DequeueAnalyzedInfo(std::vector<std::shared_ptr<PresentEvent>>* presentEvents); // std::vector<std::shared_ptr<PresentEvent>>* lostPresentEvents
 DOUBLE QpcDeltaToSeconds(_In_ ULONGLONG qpcDelta);
 ULONGLONG SecondsDeltaToQpc(_In_ DOUBLE secondsDelta);
 DOUBLE QpcToSeconds(_In_ ULONGLONG qpc);

plugins/ExtendedTools/PresentMon/PresentMonTraceConsumer.cpp

@@ -150,8 +150,8 @@ bool mSeenDxgkPresentInfo = false;
 PH_FAST_LOCK mPresentEventMutex = PH_FAST_LOCK_INIT;
 std::vector<std::shared_ptr<PresentEvent>> mCompletePresentEvents;
 
-PH_FAST_LOCK mLostPresentEventMutex = PH_FAST_LOCK_INIT;
-std::vector<std::shared_ptr<PresentEvent>> mLostPresentEvents;
+//PH_FAST_LOCK mLostPresentEventMutex = PH_FAST_LOCK_INIT;
+//std::vector<std::shared_ptr<PresentEvent>> mLostPresentEvents;
 
 VOID CompletePresent(std::shared_ptr<PresentEvent> p);
 std::shared_ptr<PresentEvent> FindBySubmitSequence(uint32_t submitSequence);
@@ -1614,11 +1614,11 @@ void RemoveLostPresent(std::shared_ptr<PresentEvent> p)
     assert(hasRemovedElement);
 
     // Update the list of lost presents.
-    {
-        PhAcquireFastLockExclusive(&mPresentEventMutex);
-        mLostPresentEvents.push_back(mAllPresents[p->mAllPresentsTrackingIndex]);
-        PhReleaseFastLockExclusive(&mPresentEventMutex);
-    }
+    //{
+    //    PhAcquireFastLockExclusive(&mLostPresentEventMutex);
+    //    mLostPresentEvents.push_back(mAllPresents[p->mAllPresentsTrackingIndex]);
+    //    PhReleaseFastLockExclusive(&mLostPresentEventMutex);
+    //}
 
     mAllPresents[p->mAllPresentsTrackingIndex] = nullptr;
 }
@@ -1850,9 +1850,9 @@ void DequeuePresentEvents(std::vector<std::shared_ptr<PresentEvent>>& outPresent
     PhReleaseFastLockExclusive(&mPresentEventMutex);
 }
 
-void DequeueLostPresentEvents(std::vector<std::shared_ptr<PresentEvent>>& outPresentEvents)
-{
-    PhAcquireFastLockExclusive(&mLostPresentEventMutex);
-    outPresentEvents.swap(mLostPresentEvents);
-    PhReleaseFastLockExclusive(&mLostPresentEventMutex);
-}
+//void DequeueLostPresentEvents(std::vector<std::shared_ptr<PresentEvent>>& outPresentEvents)
+//{
+//    PhAcquireFastLockExclusive(&mLostPresentEventMutex);
+//    outPresentEvents.swap(mLostPresentEvents);
+//    PhReleaseFastLockExclusive(&mLostPresentEventMutex);
+//}

plugins/ExtendedTools/PresentMon/PresentMonTraceConsumer.hpp

@@ -178,4 +178,4 @@ void HandleWin7DxgkVSyncDPC(EVENT_RECORD* pEventRecord);
 void HandleWin7DxgkMMIOFlip(EVENT_RECORD* pEventRecord);
 
 void DequeuePresentEvents(std::vector<std::shared_ptr<PresentEvent>>& outPresentEvents);
-void DequeueLostPresentEvents(std::vector<std::shared_ptr<PresentEvent>>& outPresentEvents);
+//void DequeueLostPresentEvents(std::vector<std::shared_ptr<PresentEvent>>& outPresentEvents);

plugins/ExtendedTools/PresentMon/TraceSession.cpp

@@ -348,12 +348,11 @@ VOID StopFpsTraceSession(
 }
 
 VOID DequeueAnalyzedInfo(
-    std::vector<std::shared_ptr<PresentEvent>>* presentEvents,
-    std::vector<std::shared_ptr<PresentEvent>>* lostPresentEvents
+    std::vector<std::shared_ptr<PresentEvent>>* presentEvents
     )
 {
     DequeuePresentEvents(*presentEvents);
-    DequeueLostPresentEvents(*lostPresentEvents);
+    //DequeueLostPresentEvents(*lostPresentEvents);
 }
 
 DOUBLE QpcDeltaToSeconds(