Merge "Introduce thread safety to InputDeviceMetricsCollector" into main (9a8dd7cf) · Commits · e / os / android_frameworks_native

services/inputflinger/InputDeviceMetricsCollector.cpp

+49 −17

Original line number	Diff line number	Diff line
		@@ -125,58 +125,84 @@ InputDeviceMetricsCollector::InputDeviceMetricsCollector(InputListenerInterface&

		void InputDeviceMetricsCollector::notifyInputDevicesChanged(
		const NotifyInputDevicesChangedArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		onInputDevicesChanged(args.inputDeviceInfos);
		}
		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifyConfigurationChanged(
		const NotifyConfigurationChangedArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		}
		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifyKey(const NotifyKeyArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		const SourceProvider getSources = [&args](const MetricsDeviceInfo& info) {
		return std::set{getUsageSourceForKeyArgs(info.keyboardType, args)};
		};
		onInputDeviceUsage(DeviceId{args.deviceId}, nanoseconds(args.eventTime), getSources);

		}
		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifyMotion(const NotifyMotionArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		onInputDeviceUsage(DeviceId{args.deviceId}, nanoseconds(args.eventTime),
		[&args](const auto&) { return getUsageSourcesForMotionArgs(args); });
		}

		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifySwitch(const NotifySwitchArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		}
		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifySensor(const NotifySensorArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		}
		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifyVibratorState(const NotifyVibratorStateArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		}
		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifyDeviceReset(const NotifyDeviceResetArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		}
		mNextListener.notify(args);
		}

		void InputDeviceMetricsCollector::notifyPointerCaptureChanged(
		const NotifyPointerCaptureChangedArgs& args) {
		{
		std::scoped_lock lock(mLock);
		reportCompletedSessions();
		}
		mNextListener.notify(args);
		}

		@@ -185,10 +211,12 @@ void InputDeviceMetricsCollector::notifyDeviceInteraction(int32_t deviceId, nsec
		if (isIgnoredInputDeviceId(deviceId)) {
		return;
		}
		std::scoped_lock lock(mLock);
		mInteractionsQueue.push(DeviceId{deviceId}, timestamp, uids);
		}

		void InputDeviceMetricsCollector::dump(std::string& dump) {
		std::scoped_lock lock(mLock);
		dump += "InputDeviceMetricsCollector:\n";

		dump += " Logged device IDs: " + dumpMapKeys(mLoggedDeviceInfos, &toString) + "\n";
		@@ -196,6 +224,10 @@ void InputDeviceMetricsCollector::dump(std::string& dump) {
		dumpMapKeys(mActiveUsageSessions, &toString) + "\n";
		}

		void InputDeviceMetricsCollector::monitor() {
		std::scoped_lock lock(mLock);
		}

		void InputDeviceMetricsCollector::onInputDevicesChanged(const std::vector<InputDeviceInfo>& infos) {
		std::map<DeviceId, MetricsDeviceInfo> newDeviceInfos;

services/inputflinger/InputDeviceMetricsCollector.h

+16 −11

Original line number	Diff line number	Diff line
		@@ -21,12 +21,14 @@
		#include "NotifyArgs.h"
		#include "SyncQueue.h"

		#include <android-base/thread_annotations.h>
		#include <ftl/mixins.h>
		#include <gui/WindowInfo.h>
		#include <input/InputDevice.h>
		#include <chrono>
		#include <functional>
		#include <map>
		#include <mutex>
		#include <set>
		#include <vector>

		@@ -34,8 +36,6 @@ namespace android {

		/**
		* Logs metrics about registered input devices and their usages.
		*
		* All methods in the InputListenerInterface must be called from a single thread.
		*/
		class InputDeviceMetricsCollectorInterface : public InputListenerInterface {
		public:
		@@ -50,6 +50,9 @@ public:
		* This method may be called on any thread (usually by the input manager on a binder thread).
		*/
		virtual void dump(std::string& dump) = 0;

		/** Called by the heartbeat to ensure that this component has not deadlocked. */
		virtual void monitor() = 0;
		};

		/** The logging interface for the metrics collector, injected for testing. */
		@@ -116,10 +119,12 @@ public:
		void notifyDeviceInteraction(int32_t deviceId, nsecs_t timestamp,
		const std::set<gui::Uid>& uids) override;
		void dump(std::string& dump) override;
		void monitor() override;

		private:
		std::mutex mLock;
		InputListenerInterface& mNextListener;
		InputDeviceMetricsLogger& mLogger;
		InputDeviceMetricsLogger& mLogger GUARDED_BY(mLock);
		const std::chrono::nanoseconds mUsageSessionTimeout;

		// Type-safe wrapper for input device id.
		@@ -135,10 +140,10 @@ private:
		using Uid = gui::Uid;
		using MetricsDeviceInfo = InputDeviceMetricsLogger::MetricsDeviceInfo;

		std::map<DeviceId, MetricsDeviceInfo> mLoggedDeviceInfos;
		std::map<DeviceId, MetricsDeviceInfo> mLoggedDeviceInfos GUARDED_BY(mLock);

		using Interaction = std::tuple<DeviceId, std::chrono::nanoseconds, std::set<Uid>>;
		SyncQueue<Interaction> mInteractionsQueue;
		SyncQueue<Interaction> mInteractionsQueue GUARDED_BY(mLock);

		class ActiveSession {
		public:
		@@ -166,16 +171,16 @@ private:
		};

		// The input devices that currently have active usage sessions.
		std::map<DeviceId, ActiveSession> mActiveUsageSessions;
		std::map<DeviceId, ActiveSession> mActiveUsageSessions GUARDED_BY(mLock);

		void onInputDevicesChanged(const std::vector<InputDeviceInfo>& infos);
		void onInputDeviceRemoved(DeviceId deviceId, const MetricsDeviceInfo& info);
		void onInputDevicesChanged(const std::vector<InputDeviceInfo>& infos) REQUIRES(mLock);
		void onInputDeviceRemoved(DeviceId deviceId, const MetricsDeviceInfo& info) REQUIRES(mLock);
		using SourceProvider =
		std::function<std::set<InputDeviceUsageSource>(const MetricsDeviceInfo&)>;
		void onInputDeviceUsage(DeviceId deviceId, std::chrono::nanoseconds eventTime,
		const SourceProvider& getSources);
		void onInputDeviceInteraction(const Interaction&);
		void reportCompletedSessions();
		const SourceProvider& getSources) REQUIRES(mLock);
		void onInputDeviceInteraction(const Interaction&) REQUIRES(mLock);
		void reportCompletedSessions() REQUIRES(mLock);
		};

		} // namespace android

services/inputflinger/InputManager.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,9 @@ void InputManager::monitor() {
		mReader->monitor();
		mBlocker->monitor();
		mProcessor->monitor();
		if (ENABLE_INPUT_DEVICE_USAGE_METRICS) {
		mCollector->monitor();
		}
		mDispatcher->monitor();
		}