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

Commit 274aa2cf authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

Trace all InputListener stages 

InputListeners were previously traced using QueuedInputListener, which
only served as a point trace of an event being processed.

In the new approach, we add a wrapper around all of the stages so that
we can get an idea of how long each stage took to process an event.

Bug: 210460522
Test: manual with perfetto
Change-Id: I4da2cff3ffec1c881978ee72d4b870a54b6d02c9
parent a37bad12

services/inputflinger/InputListener.cpp

+78 −17
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <android-base/stringprintf.h>

#include <android/log.h>

#include <utils/Trace.h>

#include <input/TraceTools.h>



using android::base::StringPrintf;
@@ -61,58 +61,42 @@ void InputListenerInterface::notify(const NotifyArgs& generalArgs) { 


// --- QueuedInputListener ---



static inline void traceEvent(const char* functionName, int32_t id) {

    if (ATRACE_ENABLED()) {

        std::string message = StringPrintf("%s(id=0x%" PRIx32 ")", functionName, id);

        ATRACE_NAME(message.c_str());

    }

}



QueuedInputListener::QueuedInputListener(InputListenerInterface& innerListener)

      : mInnerListener(innerListener) {}



void QueuedInputListener::notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyKey(const NotifyKeyArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyMotion(const NotifyMotionArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifySwitch(const NotifySwitchArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifySensor(const NotifySensorArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyVibratorState(const NotifyVibratorStateArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyDeviceReset(const NotifyDeviceResetArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}



void QueuedInputListener::notifyPointerCaptureChanged(const NotifyPointerCaptureChangedArgs& args) {

    traceEvent(__func__, args.id);

    mArgsQueue.emplace_back(args);

}
@@ -123,4 +107,81 @@ void QueuedInputListener::flush() { 
    mArgsQueue.clear();

}



// --- TracedInputListener ---



TracedInputListener::TracedInputListener(const char* name, InputListenerInterface& innerListener)

      : mInnerListener(innerListener), mName(name) {}



void TracedInputListener::notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifyKey(const NotifyKeyArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifyMotion(const NotifyMotionArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifySwitch(const NotifySwitchArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifySensor(const NotifySensorArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifyVibratorState(const NotifyVibratorStateArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifyDeviceReset(const NotifyDeviceResetArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



void TracedInputListener::notifyPointerCaptureChanged(const NotifyPointerCaptureChangedArgs& args) {

    constexpr static auto& fnName = __func__;

    ATRACE_NAME_IF(ATRACE_ENABLED(), [&]() {

        return StringPrintf("%s::%s(id=0x%" PRIx32 ")", mName, fnName, args.id);

    });

    mInnerListener.notify(args);

}



} // namespace android

services/inputflinger/InputManager.cpp

+14 −5
Original line number Diff line number Diff line
@@ -122,15 +122,24 @@ InputManager::InputManager(const sp<InputReaderPolicyInterface>& readerPolicy, 
    mInputFlingerRust = createInputFlingerRust();



    mDispatcher = createInputDispatcher(dispatcherPolicy);

    mTracingStages.emplace_back(

            std::make_unique<TracedInputListener>("InputDispatcher", *mDispatcher));



    if (ENABLE_INPUT_DEVICE_USAGE_METRICS) {

        mCollector = std::make_unique<InputDeviceMetricsCollector>(*mDispatcher);

        mCollector = std::make_unique<InputDeviceMetricsCollector>(*mTracingStages.back());

        mTracingStages.emplace_back(

                std::make_unique<TracedInputListener>("MetricsCollector", *mCollector));

    }



    mProcessor = ENABLE_INPUT_DEVICE_USAGE_METRICS ? std::make_unique<InputProcessor>(*mCollector)

                                                   : std::make_unique<InputProcessor>(*mDispatcher);

    mBlocker = std::make_unique<UnwantedInteractionBlocker>(*mProcessor);

    mReader = createInputReader(readerPolicy, *mBlocker);

    mProcessor = std::make_unique<InputProcessor>(*mTracingStages.back());

    mTracingStages.emplace_back(

            std::make_unique<TracedInputListener>("InputProcessor", *mProcessor));



    mBlocker = std::make_unique<UnwantedInteractionBlocker>(*mTracingStages.back());

    mTracingStages.emplace_back(

            std::make_unique<TracedInputListener>("UnwantedInteractionBlocker", *mBlocker));



    mReader = createInputReader(readerPolicy, *mTracingStages.back());

}



InputManager::~InputManager() {

services/inputflinger/InputManager.h

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ private: 
    std::unique_ptr<InputDispatcherInterface> mDispatcher;



    std::shared_ptr<IInputFlingerRust> mInputFlingerRust;



    std::vector<std::unique_ptr<TracedInputListener>> mTracingStages;

};



} // namespace android

services/inputflinger/include/InputListener.h

+22 −0
Original line number Diff line number Diff line
@@ -76,4 +76,26 @@ private: 
    std::vector<NotifyArgs> mArgsQueue;

};



/*

 * An implementation of the listener interface that traces the calls to its inner listener.

 */

class TracedInputListener : public InputListenerInterface {

public:

    explicit TracedInputListener(const char* name, InputListenerInterface& innerListener);



    virtual void notifyInputDevicesChanged(const NotifyInputDevicesChangedArgs& args) override;

    virtual void notifyConfigurationChanged(const NotifyConfigurationChangedArgs& args) override;

    virtual void notifyKey(const NotifyKeyArgs& args) override;

    virtual void notifyMotion(const NotifyMotionArgs& args) override;

    virtual void notifySwitch(const NotifySwitchArgs& args) override;

    virtual void notifySensor(const NotifySensorArgs& args) override;

    virtual void notifyDeviceReset(const NotifyDeviceResetArgs& args) override;

    void notifyVibratorState(const NotifyVibratorStateArgs& args) override;

    void notifyPointerCaptureChanged(const NotifyPointerCaptureChangedArgs& args) override;



private:

    InputListenerInterface& mInnerListener;

    const char* mName;

};



} // namespace android