commit c5f2c455a99fd2a05cf3e9d3af57710b6a4334fa
author Yiwei Zhang <zzyiwei@google.com> Tue May 08 16:31:56 2018 -0700
committer Yiwei Zhang <zzyiwei@google.com> Tue May 08 17:56:12 2018 -0700
tree 39d96a1faf91a61778b8cbfdfcda41de22e2d20c
parent edb393d1552f04c7a65c01e7300fa2777f012c69

SF TimeStats: change the container of TimeRecord

The current container of TimeRecord is std::vector which behaves not
well when it tries to erase an element on the front. This change update
the container to std::deque instead.

Test: dumpsys SurfaceFlinger --timestats <see go/sf-timestats for args>
Bug: b/70388650
Change-Id: Ib3f695f46eb21dc27b0ed725b86764331f304be2

services/surfaceflinger/TimeStats/TimeStats.cpp

diff --git a/services/surfaceflinger/TimeStats/TimeStats.cpp b/services/surfaceflinger/TimeStats/TimeStats.cpp
index a6833a5..b207d99 100644
--- a/services/surfaceflinger/TimeStats/TimeStats.cpp
+++ b/services/surfaceflinger/TimeStats/TimeStats.cpp
@@ -152,7 +152,7 @@
 
     LayerRecord& layerRecord = timeStatsTracker[layerName];
     TimeRecord& prevTimeRecord = layerRecord.prevTimeRecord;
-    std::vector<TimeRecord>& timeRecords = layerRecord.timeRecords;
+    std::deque<TimeRecord>& timeRecords = layerRecord.timeRecords;
     while (!timeRecords.empty()) {
         if (!recordReadyLocked(layerName, &timeRecords[0])) break;
         ALOGV("[%s]-[%" PRIu64 "]-presentFenceTime[%" PRId64 "]", layerName.c_str(),
@@ -199,8 +199,7 @@
             timeStats.stats[layerName].statsEnd = static_cast<int64_t>(std::time(0));
         }
         prevTimeRecord = timeRecords[0];
-        // TODO(zzyiwei): change timeRecords to use std::deque
-        timeRecords.erase(timeRecords.begin());
+        timeRecords.pop_front();
         layerRecord.waitData--;
     }
 }