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

Commit 052fb0b3 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

InputTracer: Ensure eventProcessingComplete called after dropping events 

There should be no more dispatching decisions made after notifying the
tracer that event processing is complete. However, there was a codepath
where we were previously dropping events and synthesizing cancelations
after calling eventProcessingComplete().

Move the eventProcessingComplete() call to after handling dropped
events.

Bug: 210460522
Test: atest inputflinger_tests
Change-Id: I4b61ef85f6caef345171bfd0a5a01c4367573512
parent 1ea04a33

services/inputflinger/dispatcher/InputDispatcher.cpp

+26 −8
Original line number Diff line number Diff line
@@ -103,6 +103,26 @@ void ensureEventTraced(const Entry& entry) { 
    }

}



// Helper to get a trace tracker from a traced key or motion entry.

const std::unique_ptr<trace::EventTrackerInterface>& getTraceTracker(const EventEntry& entry) {

    switch (entry.type) {

        case EventEntry::Type::MOTION: {

            const auto& motion = static_cast<const MotionEntry&>(entry);

            ensureEventTraced(motion);

            return motion.traceTracker;

        }

        case EventEntry::Type::KEY: {

            const auto& key = static_cast<const KeyEntry&>(entry);

            ensureEventTraced(key);

            return key.traceTracker;

        }

        default: {

            const static std::unique_ptr<trace::EventTrackerInterface> kNullTracker;

            return kNullTracker;

        }

    }

}



// Temporarily releases a held mutex for the lifetime of the instance.

// Named to match std::scoped_lock

class scoped_unlock {
@@ -1147,10 +1167,6 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t& nextWakeupTime) { 
                dropReason = DropReason::BLOCKED;

            }

            done = dispatchKeyLocked(currentTime, keyEntry, &dropReason, nextWakeupTime);

            if (done && mTracer) {

                ensureEventTraced(*keyEntry);

                mTracer->eventProcessingComplete(*keyEntry->traceTracker);

            }

            break;

        }
@@ -1176,10 +1192,6 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t& nextWakeupTime) { 
                }

            }

            done = dispatchMotionLocked(currentTime, motionEntry, &dropReason, nextWakeupTime);

            if (done && mTracer) {

                ensureEventTraced(*motionEntry);

                mTracer->eventProcessingComplete(*motionEntry->traceTracker);

            }

            break;

        }
@@ -1205,6 +1217,12 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t& nextWakeupTime) { 
        }

        mLastDropReason = dropReason;



        if (mTracer) {

            if (auto& traceTracker = getTraceTracker(*mPendingEvent); traceTracker != nullptr) {

                mTracer->eventProcessingComplete(*traceTracker);

            }

        }



        releasePendingEventLocked();

        nextWakeupTime = LLONG_MIN; // force next poll to wake up immediately

    }