Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e5c6bb3 authored by Yiwei Zhang's avatar Yiwei Zhang Committed by android-build-merger
Browse files

Merge "TimeStats: fix a racing case" into qt-dev am: e8abff06 

am: 3613b7df

Change-Id: I7399e395e68d472eed6e56e04c7313c5e971c3c9
parents ee143f3d 3613b7df

libs/gui/BufferQueueProducer.cpp

+8 −8
Original line number Diff line number Diff line
@@ -1007,14 +1007,6 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
        mCallbackCondition.notify_all();

    }



    // 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 = {
@@ -1026,6 +1018,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;

}

services/surfaceflinger/TimeStats/TimeStats.cpp

+18 −0
Original line number Diff line number Diff line
@@ -291,6 +291,9 @@ void TimeStats::setLatchTime(int32_t layerID, uint64_t frameNumber, nsecs_t latc 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.latchTime = latchTime;
@@ -306,6 +309,9 @@ void TimeStats::setDesiredTime(int32_t layerID, uint64_t frameNumber, nsecs_t de 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.desiredTime = desiredTime;
@@ -321,6 +327,9 @@ void TimeStats::setAcquireTime(int32_t layerID, uint64_t frameNumber, nsecs_t ac 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.acquireTime = acquireTime;
@@ -338,6 +347,9 @@ void TimeStats::setAcquireFence(int32_t layerID, uint64_t frameNumber, 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.acquireFence = acquireFence;
@@ -353,6 +365,9 @@ void TimeStats::setPresentTime(int32_t layerID, uint64_t frameNumber, nsecs_t pr 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.frameTime.presentTime = presentTime;
@@ -374,6 +389,9 @@ void TimeStats::setPresentFence(int32_t layerID, uint64_t frameNumber, 
    std::lock_guard<std::mutex> lock(mMutex);

    if (!mTimeStatsTracker.count(layerID)) return;

    LayerRecord& layerRecord = mTimeStatsTracker[layerID];

    if (layerRecord.waitData < 0 ||

        layerRecord.waitData >= static_cast<int32_t>(layerRecord.timeRecords.size()))

        return;

    TimeRecord& timeRecord = layerRecord.timeRecords[layerRecord.waitData];

    if (timeRecord.frameTime.frameNumber == frameNumber) {

        timeRecord.presentFence = presentFence;