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

Commit 45a864ce authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge "DispSync: Actually wait forever" into nyc-dev am: 8a56bb70 

am: d9718276

* commit 'd9718276':
  DispSync: Actually wait forever

Change-Id: I982dfa567820f997b6bb8662979ea8d30c38b4c5
parents 9ef48e8d d9718276

services/surfaceflinger/DispSync.cpp

+10 −6
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ public: 
    virtual bool threadLoop() {

    virtual bool threadLoop() {

        status_t err;

        status_t err;

        nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);

        nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);

        nsecs_t nextEventTime = 0;





        while (true) {

        while (true) {

            Vector<CallbackInvocation> callbackInvocations;

            Vector<CallbackInvocation> callbackInvocations;
@@ -127,16 +126,21 @@ public: 
                    continue;

                    continue;

                }

                }





                nextEventTime = computeNextEventTimeLocked(now);

                targetTime = computeNextEventTimeLocked(now);

                targetTime = nextEventTime;





                bool isWakeup = false;

                bool isWakeup = false;





                if (now < targetTime) {

                if (now < targetTime) {

                    if (kTraceDetailedInfo) ATRACE_NAME("DispSync waiting");



                    if (targetTime == INT64_MAX) {

                        ALOGV("[%s] Waiting forever", mName);

                        err = mCond.wait(mMutex);

                    } else {

                        ALOGV("[%s] Waiting until %" PRId64, mName,

                        ALOGV("[%s] Waiting until %" PRId64, mName,

                                ns2us(targetTime));

                                ns2us(targetTime));

                    if (kTraceDetailedInfo) ATRACE_NAME("DispSync waiting");

                        err = mCond.waitRelative(mMutex, targetTime - now);

                        err = mCond.waitRelative(mMutex, targetTime - now);

                    }





                    if (err == TIMED_OUT) {

                    if (err == TIMED_OUT) {

                        isWakeup = true;

                        isWakeup = true;