Merge branch 'feature/app_provider_and_inst_lat_update' into release-gtd-external/rc2.3.0

Author: markgalvan-intel

IntelPresentMon/PresentMonMiddleware/ConcreteMiddleware.cpp

@@ -685,8 +685,6 @@ static void ReportMetricsHelper(
             chain->mDisplayLatency                       .push_back(metrics.mDisplayLatency);
             chain->mDisplayedTime                        .push_back(metrics.mDisplayedTime);
             chain->mDropped                              .push_back(0.0);
-            chain->mInstrumentedDisplayLatency           .push_back(metrics.mInstrumentedDisplayLatency);
-            chain->mInstrumentedReadyTimeToDisplayLatency.push_back(metrics.mInstrumentedReadyTimeToDisplayLatency);
         } else {
             chain->mDropped       .push_back(1.0);
         }
@@ -708,8 +706,16 @@ static void ReportMetricsHelper(
             }
         }
 
-        if (displayed && displayIndex == appIndex && metrics.mInstrumentedRenderLatency != 0) {
-            chain->mInstrumentedRenderLatency.push_back(metrics.mInstrumentedRenderLatency);
+        if (displayed && displayIndex == appIndex) {
+            if (metrics.mInstrumentedRenderLatency != 0) {
+                chain->mInstrumentedRenderLatency.push_back(metrics.mInstrumentedRenderLatency);
+            }
+            if (metrics.mInstrumentedDisplayLatency != 0) {
+                chain->mInstrumentedDisplayLatency.push_back(metrics.mInstrumentedDisplayLatency);
+            }
+            if (metrics.mInstrumentedReadyTimeToDisplayLatency != 0) {
+                chain->mInstrumentedReadyTimeToDisplayLatency.push_back(metrics.mInstrumentedReadyTimeToDisplayLatency);
+            }
         }
 
         displayIndex += 1;

PresentData/PresentMonTraceConsumer.cpp

@@ -2298,6 +2298,22 @@ void PMTraceConsumer::RuntimePresentStart(Runtime runtime, EVENT_HEADER const& h
 
     ApplyPresentFrameType(present);
 
+    TrackPresent(present, &mOrderedPresentsByProcessId[present->ProcessId]);
+}
+
+// No TRACK_PRESENT instrumentation here because each runtime Present::Start
+// event is instrumented and we assume we'll see the corresponding Stop event
+// for any completed present.
+void PMTraceConsumer::RuntimePresentStop(Runtime runtime, EVENT_HEADER const& hdr, uint32_t result)
+{
+    // Present_Start and Present_Stop happen on the same thread, so Lookup the PresentEvent
+    // most-recently operated on by the same thread.  If there is none, ignore this event.
+    auto eventIter = mPresentByThreadId.find(hdr.ThreadId);
+    if (eventIter == mPresentByThreadId.end()) {
+        return;
+    }
+    auto present = eventIter->second;
+
     if (mNextAppFrameId != 0) {
         auto ii = mPendingAppTimingDataByAppFrameId.find(mNextAppFrameId);
         if (ii != mPendingAppTimingDataByAppFrameId.end()) {
@@ -2322,22 +2338,6 @@ void PMTraceConsumer::RuntimePresentStart(Runtime runtime, EVENT_HEADER const& h
         }
     }
 
-    TrackPresent(present, &mOrderedPresentsByProcessId[present->ProcessId]);
-}
-
-// No TRACK_PRESENT instrumentation here because each runtime Present::Start
-// event is instrumented and we assume we'll see the corresponding Stop event
-// for any completed present.
-void PMTraceConsumer::RuntimePresentStop(Runtime runtime, EVENT_HEADER const& hdr, uint32_t result)
-{
-    // Present_Start and Present_Stop happen on the same thread, so Lookup the PresentEvent
-    // most-recently operated on by the same thread.  If there is none, ignore this event.
-    auto eventIter = mPresentByThreadId.find(hdr.ThreadId);
-    if (eventIter == mPresentByThreadId.end()) {
-        return;
-    }
-    auto present = eventIter->second;
-
     // Set the runtime and Present_Stop time.
     VerboseTraceBeforeModifyingPresent(present.get());
     present->Runtime = runtime;