commit 6be8244a9d05011b30c733ddd5c4b90af3a82fcd
author Pablo Gamito <pablogamito@google.com> Mon Jun 13 11:04:34 2022 +0000
committer Pablo Gamito <pablogamito@google.com> Mon Jun 13 11:04:34 2022 +0000
tree 5c7edf204253302abf29eadbc0960340e66d6cef
parent b877579db39b7428fe2d3e6dee7e4a61cabda59e

Dump last committed vSyncId on layers trace start

Keep track of the last committed vSyncId to dump it when we start the layers trace

Bug: 230462538

Test: Check a vSyncId is dumped in the first entry of the layers trace
Change-Id: Ie4c48acf99057cdb8bfebbf5cea3729ab5014bd4

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 446d744..9abee99 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2170,6 +2170,7 @@
         // This will block and tracing should only be enabled for debugging.
         mLayerTracing.notify(mVisibleRegionsDirty, frameTime, vsyncId);
     }
+    mLastCommittedVsyncId = vsyncId;
 
     persistDisplayBrightness(mustComposite);
 
@@ -5847,7 +5848,7 @@
                         mScheduler
                                 ->schedule([&]() FTL_FAKE_GUARD(mStateLock) {
                                     mLayerTracing.notify(true /* visibleRegionDirty */,
-                                                         startingTime, -1 /* vsyncId */);
+                                                         startingTime, mLastCommittedVsyncId);
                                 })
                                 .wait();
                     }

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 41de2b6..ca4de73 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1266,6 +1266,8 @@
     const std::unique_ptr<FrameTracer> mFrameTracer;
     const std::unique_ptr<frametimeline::FrameTimeline> mFrameTimeline;
 
+    int64_t mLastCommittedVsyncId = -1;
+
     // If blurs should be enabled on this device.
     bool mSupportsBlur = false;
     // If blurs are considered expensive and should require high GPU frequency.