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

Commit c86805e1 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge changes I1725ca2a,I330cbaed 

* changes:
  InputDispatcher: Use constexpr values for debug flags
  InputDispatcher: Refactor CommandQueue to use lambdas
parents 477735bf 61a5d245

services/inputflinger/dispatcher/Entry.cpp

+0 −13
Original line number Diff line number Diff line
@@ -319,17 +319,4 @@ uint32_t DispatchEntry::nextSeq() { 
    return seq;

}



// --- CommandEntry ---



CommandEntry::CommandEntry(Command command)

      : command(command),

        eventTime(0),

        keyEntry(nullptr),

        userActivityEventType(0),

        seq(0),

        handled(false),

        enabled(false) {}



CommandEntry::~CommandEntry() {}



} // namespace android::inputdispatcher

services/inputflinger/dispatcher/Entry.h

+0 −49
Original line number Diff line number Diff line
@@ -245,55 +245,6 @@ private: 
VerifiedKeyEvent verifiedKeyEventFromKeyEntry(const KeyEntry& entry);

VerifiedMotionEvent verifiedMotionEventFromMotionEntry(const MotionEntry& entry);



class InputDispatcher;

// A command entry captures state and behavior for an action to be performed in the

// dispatch loop after the initial processing has taken place.  It is essentially

// a kind of continuation used to postpone sensitive policy interactions to a point

// in the dispatch loop where it is safe to release the lock (generally after finishing

// the critical parts of the dispatch cycle).

//

// The special thing about commands is that they can voluntarily release and reacquire

// the dispatcher lock at will.  Initially when the command starts running, the

// dispatcher lock is held.  However, if the command needs to call into the policy to

// do some work, it can release the lock, do the work, then reacquire the lock again

// before returning.

//

// This mechanism is a bit clunky but it helps to preserve the invariant that the dispatch

// never calls into the policy while holding its lock.

//

// Commands are implicitly 'LockedInterruptible'.

struct CommandEntry;

typedef std::function<void(InputDispatcher&, CommandEntry*)> Command;



class Connection;

struct CommandEntry {

    explicit CommandEntry(Command command);

    ~CommandEntry();



    Command command;



    // parameters for the command (usage varies by command)

    sp<Connection> connection;

    nsecs_t eventTime;

    std::shared_ptr<KeyEntry> keyEntry;

    std::shared_ptr<SensorEntry> sensorEntry;

    std::shared_ptr<InputApplicationHandle> inputApplicationHandle;

    std::string reason;

    int32_t userActivityEventType;

    uint32_t seq;

    bool handled;

    sp<IBinder> connectionToken;

    sp<IBinder> oldToken;

    sp<IBinder> newToken;

    std::string obscuringPackage;

    bool enabled;

    int32_t pid;

    nsecs_t consumeTime; // time when the event was consumed by InputConsumer

    int32_t displayId;

    float x;

    float y;

};



} // namespace android::inputdispatcher



#endif // _UI_INPUT_INPUTDISPATCHER_ENTRY_H

services/inputflinger/dispatcher/InputDispatcher.cpp

+561 −666

File changed.

Preview size limit exceeded, changes collapsed.

services/inputflinger/dispatcher/InputDispatcher.h

+34 −51
Original line number Diff line number Diff line
@@ -168,7 +168,26 @@ private: 
    std::shared_ptr<EventEntry> mPendingEvent GUARDED_BY(mLock);

    std::deque<std::shared_ptr<EventEntry>> mInboundQueue GUARDED_BY(mLock);

    std::deque<std::shared_ptr<EventEntry>> mRecentQueue GUARDED_BY(mLock);

    std::deque<std::unique_ptr<CommandEntry>> mCommandQueue GUARDED_BY(mLock);



    // A command entry captures state and behavior for an action to be performed in the

    // dispatch loop after the initial processing has taken place.  It is essentially

    // a kind of continuation used to postpone sensitive policy interactions to a point

    // in the dispatch loop where it is safe to release the lock (generally after finishing

    // the critical parts of the dispatch cycle).

    //

    // The special thing about commands is that they can voluntarily release and reacquire

    // the dispatcher lock at will.  Initially when the command starts running, the

    // dispatcher lock is held.  However, if the command needs to call into the policy to

    // do some work, it can release the lock, do the work, then reacquire the lock again

    // before returning.

    //

    // This mechanism is a bit clunky but it helps to preserve the invariant that the dispatch

    // never calls into the policy while holding its lock.

    //

    // Commands are called with the lock held, but they can release and re-acquire the lock from

    // within.

    using Command = std::function<void()>;

    std::deque<Command> mCommandQueue GUARDED_BY(mLock);



    DropReason mLastDropReason GUARDED_BY(mLock);
@@ -292,8 +311,8 @@ private: 


    // Deferred command processing.

    bool haveCommandsLocked() const REQUIRES(mLock);

    bool runCommandsLockedInterruptible() REQUIRES(mLock);

    void postCommandLocked(std::unique_ptr<CommandEntry> commandEntry) REQUIRES(mLock);

    bool runCommandsLockedInterruptable() REQUIRES(mLock);

    void postCommandLocked(Command&& command) REQUIRES(mLock);



    nsecs_t processAnrsLocked() REQUIRES(mLock);

    std::chrono::nanoseconds getDispatchingTimeoutLocked(const sp<IBinder>& token) REQUIRES(mLock);
@@ -401,7 +420,7 @@ private: 
            DropReason& dropReason) REQUIRES(mLock);

    void dispatchEventLocked(nsecs_t currentTime, std::shared_ptr<EventEntry> entry,

                             const std::vector<InputTarget>& inputTargets) REQUIRES(mLock);

    void dispatchSensorLocked(nsecs_t currentTime, std::shared_ptr<SensorEntry> entry,

    void dispatchSensorLocked(nsecs_t currentTime, const std::shared_ptr<SensorEntry>& entry,

                              DropReason* dropReason, nsecs_t* nextWakeupTime) REQUIRES(mLock);

    void dispatchDragLocked(nsecs_t currentTime, std::shared_ptr<DragEntry> entry) REQUIRES(mLock);

    void logOutboundKeyDetails(const char* prefix, const KeyEntry& entry);
@@ -448,24 +467,11 @@ private: 
     */

    void processConnectionResponsiveLocked(const Connection& connection) REQUIRES(mLock);



    /**

     * Post `doNotifyMonitorUnresponsiveLockedInterruptible` command.

     */

    void sendMonitorUnresponsiveCommandLocked(int32_t pid, std::string reason) REQUIRES(mLock);

    /**

     * Post `doNotifyWindowUnresponsiveLockedInterruptible` command.

     */

    void sendWindowUnresponsiveCommandLocked(sp<IBinder> connectionToken, std::string reason)

    void sendWindowUnresponsiveCommandLocked(const sp<IBinder>& connectionToken, std::string reason)

            REQUIRES(mLock);

    /**

     * Post `doNotifyMonitorResponsiveLockedInterruptible` command.

     */

    void sendMonitorResponsiveCommandLocked(int32_t pid) REQUIRES(mLock);

    /**

     * Post `doNotifyWindowResponsiveLockedInterruptible` command.

     */

    void sendWindowResponsiveCommandLocked(sp<IBinder> connectionToken) REQUIRES(mLock);



    void sendWindowResponsiveCommandLocked(const sp<IBinder>& connectionToken) REQUIRES(mLock);



    // Optimization: AnrTracker is used to quickly find which connection is due for a timeout next.

    // AnrTracker must be kept in-sync with all responsive connection.waitQueues.
@@ -599,53 +605,30 @@ private: 
            REQUIRES(mLock);



    // Interesting events that we might like to log or tell the framework about.

    void onDispatchCycleFinishedLocked(nsecs_t currentTime, const sp<Connection>& connection,

    void doDispatchCycleFinishedCommand(nsecs_t finishTime, const sp<Connection>& connection,

                                        uint32_t seq, bool handled, nsecs_t consumeTime)

            REQUIRES(mLock);

    void onDispatchCycleBrokenLocked(nsecs_t currentTime, const sp<Connection>& connection)

            REQUIRES(mLock);

    void doInterceptKeyBeforeDispatchingCommand(const sp<IBinder>& focusedWindowToken,

                                                KeyEntry& entry) REQUIRES(mLock);

    void onFocusChangedLocked(const FocusResolver::FocusChanges& changes) REQUIRES(mLock);

    void notifyFocusChangedLocked(const sp<IBinder>& oldFocus, const sp<IBinder>& newFocus)

    void sendFocusChangedCommandLocked(const sp<IBinder>& oldToken, const sp<IBinder>& newToken)

            REQUIRES(mLock);

    void notifyDropWindowLocked(const sp<IBinder>& token, float x, float y) REQUIRES(mLock);

    void sendDropWindowCommandLocked(const sp<IBinder>& token, float x, float y) REQUIRES(mLock);

    void sendUntrustedTouchCommandLocked(const std::string& obscuringPackage) REQUIRES(mLock);

    void onAnrLocked(const sp<Connection>& connection) REQUIRES(mLock);

    void onAnrLocked(std::shared_ptr<InputApplicationHandle> application) REQUIRES(mLock);

    void onUntrustedTouchLocked(const std::string& obscuringPackage) REQUIRES(mLock);

    void updateLastAnrStateLocked(const sp<android::gui::WindowInfoHandle>& window,

                                  const std::string& reason) REQUIRES(mLock);

    void updateLastAnrStateLocked(const InputApplicationHandle& application,

                                  const std::string& reason) REQUIRES(mLock);

    void updateLastAnrStateLocked(const std::string& windowLabel, const std::string& reason)

            REQUIRES(mLock);



    // Outbound policy interactions.

    void doNotifyConfigurationChangedLockedInterruptible(CommandEntry* commandEntry)

            REQUIRES(mLock);

    void doNotifyInputChannelBrokenLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doNotifyFocusChangedLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doNotifyDropWindowLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);



    // ANR-related callbacks - start

    void doNotifyNoFocusedWindowAnrLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doNotifyWindowUnresponsiveLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doNotifyMonitorUnresponsiveLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doNotifyWindowResponsiveLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doNotifyMonitorResponsiveLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    // ANR-related callbacks - end

    void doNotifySensorLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doNotifyUntrustedTouchLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doInterceptKeyBeforeDispatchingLockedInterruptible(CommandEntry* commandEntry)

            REQUIRES(mLock);

    void doDispatchCycleFinishedLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doSetPointerCaptureLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    bool afterKeyEventLockedInterruptible(const sp<Connection>& connection,

    bool afterKeyEventLockedInterruptable(const sp<Connection>& connection,

                                          DispatchEntry* dispatchEntry, KeyEntry& keyEntry,

                                          bool handled) REQUIRES(mLock);

    bool afterMotionEventLockedInterruptible(const sp<Connection>& connection,

    bool afterMotionEventLockedInterruptable(const sp<Connection>& connection,

                                             DispatchEntry* dispatchEntry, MotionEntry& motionEntry,

                                             bool handled) REQUIRES(mLock);

    void doPokeUserActivityLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);

    void doOnPointerDownOutsideFocusLockedInterruptible(CommandEntry* commandEntry) REQUIRES(mLock);



    // Statistics gathering.

    LatencyAggregator mLatencyAggregator GUARDED_BY(mLock);