diff options
author | Android Merger <noreply-android-build-merger@google.com> | 2019-07-09 17:52:37 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-09 17:52:37 +0000 |
commit | ad89cf8b9dbf7cbedb7addeba662acdf424505cd (patch) | |
tree | 20615a8c352e53f3403054330ff8814b07386014 | |
parent | 3b557ca588ee7efab0c732e5b488b0f0ed38ef7c (diff) | |
parent | 4e6b15d1cbbaae57227ee0f6da8764aadf77eecf (diff) | |
download | native-ad89cf8b9dbf7cbedb7addeba662acdf424505cd.tar.gz |
Merge "Snap for 5622519 from 2062c5a408eb44ead19b7e2e797e93b5781ae931 to pi-platform-release am: 6431a9bc8f" into pie-cuttlefish-testing
-rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 16 | ||||
-rw-r--r-- | services/surfaceflinger/TimeStats/TimeStats.cpp | 18 |
2 files changed, 26 insertions, 8 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index c96a2dd6a3..9d7f14cb6e 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -989,14 +989,6 @@ status_t BufferQueueProducer::queueBuffer(int slot, mCallbackCondition.broadcast(); } - // Wait without lock held - if (connectedApi == NATIVE_WINDOW_API_EGL) { - // Waiting here allows for two full buffers to be queued but not a - // third. In the event that frames take varying time, this makes a - // small trade-off in favor of latency rather than throughput. - lastQueuedFence->waitForever("Throttling EGL Production"); - } - // Update and get FrameEventHistory. nsecs_t postedTime = systemTime(SYSTEM_TIME_MONOTONIC); NewFrameEventsEntry newFrameEventsEntry = { @@ -1008,6 +1000,14 @@ status_t BufferQueueProducer::queueBuffer(int slot, addAndGetFrameTimestamps(&newFrameEventsEntry, getFrameTimestamps ? &output->frameTimestamps : nullptr); + // Wait without lock held + if (connectedApi == NATIVE_WINDOW_API_EGL) { + // Waiting here allows for two full buffers to be queued but not a + // third. In the event that frames take varying time, this makes a + // small trade-off in favor of latency rather than throughput. + lastQueuedFence->waitForever("Throttling EGL Production"); + } + return NO_ERROR; } diff --git a/services/surfaceflinger/TimeStats/TimeStats.cpp b/services/surfaceflinger/TimeStats/TimeStats.cpp index d4f1e29042..9c34aa726b 100644 --- a/services/surfaceflinger/TimeStats/TimeStats.cpp +++ b/services/surfaceflinger/TimeStats/TimeStats.cpp @@ -277,6 +277,9 @@ void TimeStats::setLatchTime(const std::string& layerName, uint64_t frameNumber, std::lock_guard<std::mutex> lock(mMutex); if (!timeStatsTracker.count(layerName)) return; LayerRecord& layerRecord = timeStatsTracker[layerName]; + if (layerRecord.waitData < 0 || + layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size())) + return; TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData]; if (timeRecord.frameNumber == frameNumber) { timeRecord.latchTime = latchTime; @@ -294,6 +297,9 @@ void TimeStats::setDesiredTime(const std::string& layerName, uint64_t frameNumbe std::lock_guard<std::mutex> lock(mMutex); if (!timeStatsTracker.count(layerName)) return; LayerRecord& layerRecord = timeStatsTracker[layerName]; + if (layerRecord.waitData < 0 || + layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size())) + return; TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData]; if (timeRecord.frameNumber == frameNumber) { timeRecord.desiredTime = desiredTime; @@ -311,6 +317,9 @@ void TimeStats::setAcquireTime(const std::string& layerName, uint64_t frameNumbe std::lock_guard<std::mutex> lock(mMutex); if (!timeStatsTracker.count(layerName)) return; LayerRecord& layerRecord = timeStatsTracker[layerName]; + if (layerRecord.waitData < 0 || + layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size())) + return; TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData]; if (timeRecord.frameNumber == frameNumber) { timeRecord.acquireTime = acquireTime; @@ -328,6 +337,9 @@ void TimeStats::setAcquireFence(const std::string& layerName, uint64_t frameNumb std::lock_guard<std::mutex> lock(mMutex); if (!timeStatsTracker.count(layerName)) return; LayerRecord& layerRecord = timeStatsTracker[layerName]; + if (layerRecord.waitData < 0 || + layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size())) + return; TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData]; if (timeRecord.frameNumber == frameNumber) { timeRecord.acquireFence = acquireFence; @@ -345,6 +357,9 @@ void TimeStats::setPresentTime(const std::string& layerName, uint64_t frameNumbe std::lock_guard<std::mutex> lock(mMutex); if (!timeStatsTracker.count(layerName)) return; LayerRecord& layerRecord = timeStatsTracker[layerName]; + if (layerRecord.waitData < 0 || + layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size())) + return; TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData]; if (timeRecord.frameNumber == frameNumber) { timeRecord.presentTime = presentTime; @@ -366,6 +381,9 @@ void TimeStats::setPresentFence(const std::string& layerName, uint64_t frameNumb std::lock_guard<std::mutex> lock(mMutex); if (!timeStatsTracker.count(layerName)) return; LayerRecord& layerRecord = timeStatsTracker[layerName]; + if (layerRecord.waitData < 0 || + layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size())) + return; TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData]; if (timeRecord.frameNumber == frameNumber) { timeRecord.presentFence = presentFence; |