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

Commit 112b5f52 authored by Jeff Brown's avatar Jeff Brown
Browse files

Improve watchdog monitor for InputReader and InputDispatcher. 

Try harder to test for liveness.  There are situations where
the lock might not be held but the input system is stuck in
a callback into the window manager policy that has hung.

Bug: 5094994
Change-Id: Iff88655512a5dc8bbb4615be65f4115e975c020b
parent 75ea64fc

services/input/InputDispatcher.cpp

+4 −0
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ void InputDispatcher::dispatchOnce() { 
    nsecs_t nextWakeupTime = LONG_LONG_MAX;

    { // acquire lock

        AutoMutex _l(mLock);

        mDispatcherIsAliveCondition.broadcast();



        dispatchOnceInnerLocked(&nextWakeupTime);



        if (runCommandsLockedInterruptible()) {
@@ -4086,6 +4088,8 @@ void InputDispatcher::dump(String8& dump) { 
void InputDispatcher::monitor() {

    // Acquire and release the lock to ensure that the dispatcher has not deadlocked.

    mLock.lock();

    mLooper->wake();

    mDispatcherIsAliveCondition.wait(mLock);

    mLock.unlock();

}

services/input/InputDispatcher.h

+2 −0
Original line number Diff line number Diff line
@@ -862,6 +862,8 @@ private: 


    Mutex mLock;



    Condition mDispatcherIsAliveCondition;



    sp<Looper> mLooper;



    EventEntry* mPendingEvent;

services/input/InputReader.cpp

+8 −3
Original line number Diff line number Diff line
@@ -278,18 +278,21 @@ void InputReader::loopOnce() { 


    { // acquire lock

        AutoMutex _l(mLock);

        mReaderIsAliveCondition.broadcast();



        if (count) {

            processEventsLocked(mEventBuffer, count);

        }

        if (!count || timeoutMillis == 0) {

            nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);

            if (now >= mNextTimeout) {

#if DEBUG_RAW_EVENTS

                ALOGD("Timeout expired, latency=%0.3fms", (now - mNextTimeout) * 0.000001f);

#endif

                mNextTimeout = LLONG_MAX;

                timeoutExpiredLocked(now);

            }

        }

    } // release lock



    // Flush queued events out to the listener.
@@ -772,6 +775,8 @@ void InputReader::dump(String8& dump) { 
void InputReader::monitor() {

    // Acquire and release the lock to ensure that the reader has not deadlocked.

    mLock.lock();

    mEventHub->wake();

    mReaderIsAliveCondition.wait(mLock);

    mLock.unlock();



    // Check the EventHub

services/input/InputReader.h

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ protected: 
private:

    Mutex mLock;



    Condition mReaderIsAliveCondition;



    sp<EventHubInterface> mEventHub;

    sp<InputReaderPolicyInterface> mPolicy;

    sp<QueuedInputListener> mQueuedListener;