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

Commit e6eef6c1 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer 

* commit 'ea74d3b7':
  make the warning timout of Fence::waitForever() implicit and longer
parents 92cf3553 ea74d3b7

include/ui/Fence.h

+3 −2
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ public: 
    // waitForever is a convenience function for waiting forever for a fence to

    // signal (just like wait(TIMEOUT_NEVER)), but issuing an error to the

    // system log and fence state to the kernel log if the wait lasts longer

    // than warningTimeout. The logname argument should be a string identifying

    // than a warning timeout.

    // The logname argument should be a string identifying

    // the caller and will be included in the log message.

    status_t waitForever(unsigned int warningTimeout, const char* logname);

    status_t waitForever(const char* logname);



    // merge combines two Fence objects, creating a new Fence object that

    // becomes signaled when both f1 and f2 are signaled (even if f1 or f2 is

libs/gui/BufferItemConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ status_t BufferItemConsumer::acquireBuffer(BufferItem *item, bool waitForFence) 
    }



    if (waitForFence) {

        err = item->mFence->waitForever(1000, "BufferItemConsumer::acquireBuffer");

        err = item->mFence->waitForever("BufferItemConsumer::acquireBuffer");

        if (err != OK) {

            BI_LOGE("Failed to wait for fence of acquired buffer: %s (%d)",

                    strerror(-err), err);

libs/gui/CpuConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ status_t CpuConsumer::lockNextBuffer(LockedBuffer *nativeBuffer) { 
    int buf = b.mBuf;



    if (b.mFence.get()) {

        err = b.mFence->waitForever(1000, "CpuConsumer::lockNextBuffer");

        err = b.mFence->waitForever("CpuConsumer::lockNextBuffer");

        if (err != OK) {

            CC_LOGE("Failed to wait for fence of acquired buffer: %s (%d)",

                    strerror(-err), err);

libs/gui/GLConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ status_t GLConsumer::doGLFenceWaitLocked() const { 
                return UNKNOWN_ERROR;

            }

        } else {

            status_t err = mCurrentFence->waitForever(1000,

            status_t err = mCurrentFence->waitForever(

                    "GLConsumer::doGLFenceWaitLocked");

            if (err != NO_ERROR) {

                ST_LOGE("doGLFenceWait: error waiting for fence: %d", err);

libs/gui/Surface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int Surface::hook_dequeueBuffer_DEPRECATED(ANativeWindow* window, 
    int fenceFd = -1;

    int result = c->dequeueBuffer(&buf, &fenceFd);

    sp<Fence> fence(new Fence(fenceFd));

    int waitResult = fence->waitForever(1000, "dequeueBuffer_DEPRECATED");

    int waitResult = fence->waitForever("dequeueBuffer_DEPRECATED");

    if (waitResult != OK) {

        ALOGE("dequeueBuffer_DEPRECATED: Fence::wait returned an error: %d",

                waitResult);
@@ -734,7 +734,7 @@ status_t Surface::lock( 
        sp<GraphicBuffer> backBuffer(GraphicBuffer::getSelf(out));

        sp<Fence> fence(new Fence(fenceFd));



        err = fence->waitForever(1000, "Surface::lock");

        err = fence->waitForever("Surface::lock");

        if (err != OK) {

            ALOGE("Fence::wait failed (%s)", strerror(-err));

            cancelBuffer(out, fenceFd);