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

Commit a34aade3 authored by Matthew Bouyack's avatar Matthew Bouyack Committed by Android (Google) Code Review
Browse files

Merge changes I5d907c33,Ibce48cd2 into cw-f-dev 

* changes:
  In SurfaceFlinger, test fence before merging
  libui: Change hasSignaled to return optional<bool>
parents 5e7f79bf 377c2033

include/ui/Fence.h

+15 −3
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <utils/String8.h>

#include <utils/Timers.h>



#include <experimental/optional>



struct ANativeWindowBuffer;



namespace android {
@@ -96,16 +98,26 @@ public: 
    // occurs then -1 is returned.

    nsecs_t getSignalTime() const;



#if __cplusplus > 201103L

    // hasSignaled returns whether the fence has signaled yet. Prefer this to

    // getSignalTime() or wait() if all you care about is whether the fence has

    // signaled.

    inline bool hasSignaled() {

    // signaled. Returns an optional bool, which will have a value if there was

    // no error.

    inline std::experimental::optional<bool> hasSignaled() {

        // The sync_wait call underlying wait() has been measured to be

        // significantly faster than the sync_fence_info call underlying

        // getSignalTime(), which might otherwise appear to be the more obvious

        // way to check whether a fence has signaled.

        return wait(0) == NO_ERROR;

        switch (wait(0)) {

            case NO_ERROR:

                return true;

            case -ETIME:

                return false;

            default:

                return {};

        }

    }

#endif



    // Flattenable interface

    size_t getFlattenedSize() const;

libs/gui/ConsumerBase.cpp

+12 −0
Original line number Diff line number Diff line
@@ -314,6 +314,18 @@ status_t ConsumerBase::addReleaseFenceLocked(int slot, 


    if (!mSlots[slot].mFence.get()) {

        mSlots[slot].mFence = fence;

        return OK;

    }



    auto signaled = mSlots[slot].mFence->hasSignaled();



    if (!signaled) {

        CB_LOGE("fence has invalid state");

        return BAD_VALUE;

    }



    if (*signaled) {

        mSlots[slot].mFence = fence;

    } else {

        char fenceName[32] = {};

        snprintf(fenceName, 32, "%.28s:%d", mName.string(), slot);