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

Commit 69bfac17 authored by Yiwei Zhang's avatar Yiwei Zhang Committed by Android (Google) Code Review
Browse files

Merge changes I40941490,Iab8c01d6,Iae949ce4 

* changes:
  SF TimeStats: optimize mTimeStatsTracker to use layerID as hash key
  SF TimeStats: add global present to present histogram
  SF TimeStats: add primary display on time metrics
parents ffe7bafa 9689e2f6

services/surfaceflinger/BufferLayer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ BufferLayer::~BufferLayer() { 
        destroyAllHwcLayers();

    }



    mTimeStats.onDestroy(getName().c_str());

    mTimeStats.onDestroy(getSequence());

}



void BufferLayer::useSurfaceDamage() {
@@ -337,8 +337,8 @@ bool BufferLayer::onPostComposition(const std::shared_ptr<FenceTime>& glDoneFenc 
    nsecs_t desiredPresentTime = getDesiredPresentTime();

    mFrameTracker.setDesiredPresentTime(desiredPresentTime);



    const std::string layerName(getName().c_str());

    mTimeStats.setDesiredTime(layerName, mCurrentFrameNumber, desiredPresentTime);

    const int32_t layerID = getSequence();

    mTimeStats.setDesiredTime(layerID, mCurrentFrameNumber, desiredPresentTime);



    std::shared_ptr<FenceTime> frameReadyFence = getCurrentFenceTime();

    if (frameReadyFence->isValid()) {
@@ -350,14 +350,14 @@ bool BufferLayer::onPostComposition(const std::shared_ptr<FenceTime>& glDoneFenc 
    }



    if (presentFence->isValid()) {

        mTimeStats.setPresentFence(layerName, mCurrentFrameNumber, presentFence);

        mTimeStats.setPresentFence(layerID, mCurrentFrameNumber, presentFence);

        mFrameTracker.setActualPresentFence(std::shared_ptr<FenceTime>(presentFence));

    } else if (mFlinger->getHwComposer().isConnected(HWC_DISPLAY_PRIMARY)) {

        // The HWC doesn't support present fences, so use the refresh

        // timestamp instead.

        const nsecs_t actualPresentTime =

                mFlinger->getHwComposer().getRefreshTimestamp(HWC_DISPLAY_PRIMARY);

        mTimeStats.setPresentTime(layerName, mCurrentFrameNumber, actualPresentTime);

        mTimeStats.setPresentTime(layerID, mCurrentFrameNumber, actualPresentTime);

        mFrameTracker.setActualPresentTime(actualPresentTime);

    }

services/surfaceflinger/BufferQueueLayer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t 
    // BufferItem's that weren't actually queued. This can happen in shared

    // buffer mode.

    bool queuedBuffer = false;

    const int32_t layerID = getSequence();

    LayerRejecter r(mDrawingState, getCurrentState(), recomputeVisibleRegions,

                    getProducerStickyTransform() != 0, mName.string(), mOverrideScalingMode,

                    getTransformToDisplayInverse(), mFreezeGeometryUpdates);
@@ -247,7 +248,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t 
        // and return early

        if (queuedBuffer) {

            Mutex::Autolock lock(mQueueItemLock);

            mTimeStats.removeTimeRecord(getName().c_str(), mQueueItems[0].mFrameNumber);

            mTimeStats.removeTimeRecord(layerID, mQueueItems[0].mFrameNumber);

            mQueueItems.removeAt(0);

            mQueuedFrames--;

        }
@@ -261,7 +262,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t 
            Mutex::Autolock lock(mQueueItemLock);

            mQueueItems.clear();

            mQueuedFrames = 0;

            mTimeStats.clearLayerRecord(getName().c_str());

            mTimeStats.clearLayerRecord(layerID);

        }



        // Once we have hit this state, the shadow queue may no longer
@@ -282,14 +283,13 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t 
        // Remove any stale buffers that have been dropped during

        // updateTexImage

        while (mQueueItems[0].mFrameNumber != currentFrameNumber) {

            mTimeStats.removeTimeRecord(getName().c_str(), mQueueItems[0].mFrameNumber);

            mTimeStats.removeTimeRecord(layerID, mQueueItems[0].mFrameNumber);

            mQueueItems.removeAt(0);

            mQueuedFrames--;

        }



        const std::string layerName(getName().c_str());

        mTimeStats.setAcquireFence(layerName, currentFrameNumber, mQueueItems[0].mFenceTime);

        mTimeStats.setLatchTime(layerName, currentFrameNumber, latchTime);

        mTimeStats.setAcquireFence(layerID, currentFrameNumber, mQueueItems[0].mFenceTime);

        mTimeStats.setLatchTime(layerID, currentFrameNumber, latchTime);



        mQueueItems.removeAt(0);

    }

services/surfaceflinger/BufferStateLayer.cpp

+12 −10
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
        return NO_ERROR;

    }



    const int32_t layerID = getSequence();



    // Reject if the layer is invalid

    uint32_t bufferWidth = s.buffer->width;

    uint32_t bufferHeight = s.buffer->height;
@@ -397,7 +399,7 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
        ALOGE("[%s] rejecting buffer: "

              "bufferWidth=%d, bufferHeight=%d, front.active.{w=%d, h=%d}",

              mName.string(), bufferWidth, bufferHeight, s.active.w, s.active.h);

        mTimeStats.removeTimeRecord(getName().c_str(), getFrameNumber());

        mTimeStats.removeTimeRecord(layerID, getFrameNumber());

        return BAD_VALUE;

    }
@@ -405,7 +407,7 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
    if (SyncFeatures::getInstance().useNativeFenceSync() && releaseFence != Fence::NO_FENCE) {

        // TODO(alecmouri): Fail somewhere upstream if the fence is invalid.

        if (!releaseFence->isValid()) {

            mTimeStats.clearLayerRecord(getName().c_str());

            mTimeStats.clearLayerRecord(layerID);

            return UNKNOWN_ERROR;

        }
@@ -415,7 +417,7 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
        auto currentStatus = s.acquireFence->getStatus();

        if (currentStatus == Fence::Status::Invalid) {

            ALOGE("Existing fence has invalid state");

            mTimeStats.clearLayerRecord(getName().c_str());

            mTimeStats.clearLayerRecord(layerID);

            return BAD_VALUE;

        }
@@ -423,7 +425,7 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
        if (incomingStatus == Fence::Status::Invalid) {

            ALOGE("New fence has invalid state");

            mDrawingState.acquireFence = releaseFence;

            mTimeStats.clearLayerRecord(getName().c_str());

            mTimeStats.clearLayerRecord(layerID);

            return BAD_VALUE;

        }
@@ -439,7 +441,7 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
                // synchronization is broken, the best we can do is hope fences

                // signal in order so the new fence will act like a union

                mDrawingState.acquireFence = releaseFence;

                mTimeStats.clearLayerRecord(getName().c_str());

                mTimeStats.clearLayerRecord(layerID);

                return BAD_VALUE;

            }

            mDrawingState.acquireFence = mergedFence;
@@ -462,16 +464,16 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
        // a GL-composited layer) not at all.

        status_t err = bindTextureImage();

        if (err != NO_ERROR) {

            mTimeStats.clearLayerRecord(getName().c_str());

            mTimeStats.clearLayerRecord(layerID);

            return BAD_VALUE;

        }

    }



    // TODO(marissaw): properly support mTimeStats

    const std::string layerName(getName().c_str());

    mTimeStats.setPostTime(getName().c_str(), getFrameNumber(), latchTime);

    mTimeStats.setAcquireFence(layerName, getFrameNumber(), getCurrentFenceTime());

    mTimeStats.setLatchTime(layerName, getFrameNumber(), latchTime);

    mTimeStats.setLayerName(layerID, getName().c_str());

    mTimeStats.setPostTime(layerID, getFrameNumber(), latchTime);

    mTimeStats.setAcquireFence(layerID, getFrameNumber(), getCurrentFenceTime());

    mTimeStats.setLatchTime(layerID, getFrameNumber(), latchTime);



    return NO_ERROR;

}

services/surfaceflinger/Layer.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1470,14 +1470,15 @@ void Layer::dumpFrameEvents(String8& result) { 
void Layer::onDisconnect() {

    Mutex::Autolock lock(mFrameEventHistoryMutex);

    mFrameEventHistory.onDisconnect();

    mTimeStats.onDisconnect(getName().c_str());

    mTimeStats.onDisconnect(getSequence());

}



void Layer::addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,

                                     FrameEventHistoryDelta* outDelta) {

    if (newTimestamps) {

        mTimeStats.setPostTime(getName().c_str(), newTimestamps->frameNumber,

                               newTimestamps->postedTime);

        const int32_t layerID = getSequence();

        mTimeStats.setLayerName(layerID, getName().c_str());

        mTimeStats.setPostTime(layerID, newTimestamps->frameNumber, newTimestamps->postedTime);

    }



    Mutex::Autolock lock(mFrameEventHistoryMutex);

services/surfaceflinger/SurfaceFlinger.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,8 @@ void SurfaceFlinger::postComposition() 
        mTimeStats.incrementClientCompositionFrames();

    }



    mTimeStats.setPresentFenceGlobal(presentFenceTime);



    if (display && getHwComposer().isConnected(display->getId()) &&

        display->getPowerMode() == HWC_POWER_MODE_OFF) {

        return;
@@ -3980,6 +3982,10 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, int 
        getHwComposer().setPowerMode(type, mode);

    }



    if (display->isPrimary()) {

        mTimeStats.setPowerMode(mode);

    }



    ALOGD("Finished setting power mode %d on display %d", mode, displayId);

}