commit 871023e652a6b24714291dec6da86d883c30bd6c
author Adithya Srinivasan <adsrini@google.com> Tue Nov 05 13:54:13 2019 -0800
committer Adithya Srinivasan <adsrini@google.com> Mon Nov 18 12:40:47 2019 -0800
tree f9f4371419ad2ebbe4a75a3a31ac8cd78b957a0e
parent 46e9976bf1d03c77ddf282f07f3aea1902cf4da5

Add HWC composition queueing trace event

As a part of the frame lifecycle, adding HWC_COMPOSITION_QUEUED event
from within SurfaceFlinger.

Test: Build, flash and run GAPID on any app
Bug: 140236090
Change-Id: I7277af4fc0368a684993ac44bb9be6668f6d2090

services/surfaceflinger/Layer.h

diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h
index 1388612..3bd9545 100644
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
@@ -601,6 +601,8 @@
 
     virtual sp<GraphicBuffer> getBuffer() const { return nullptr; }
 
+    virtual uint64_t getCurrentFrameNumber() const { return mCurrentFrameNumber; }
+
     /*
      * Returns if a frame is ready
      */

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ec15bad..e0e5711 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1715,7 +1715,12 @@
     refreshArgs.layersWithQueuedFrames.reserve(mLayersWithQueuedFrames.size());
     for (sp<Layer> layer : mLayersWithQueuedFrames) {
         auto compositionLayer = layer->getCompositionLayer();
-        if (compositionLayer) refreshArgs.layersWithQueuedFrames.push_back(compositionLayer.get());
+        if (compositionLayer) {
+            refreshArgs.layersWithQueuedFrames.push_back(compositionLayer.get());
+            mFrameTracer->traceTimestamp(layer->getSequence(), layer->getCurrentBufferId(),
+                                         layer->getCurrentFrameNumber(), systemTime(),
+                                         FrameTracer::FrameEvent::HWC_COMPOSITION_QUEUED);
+        }
     }
 
     refreshArgs.repaintEverything = mRepaintEverything.exchange(false);