Merge "statsd: Add death recipient to PowerStatsPuller" (bc426731) · Commits · e / os / android_frameworks_base

cmds/statsd/src/external/PowerStatsPuller.cpp

+29 −6

Original line number	Original line	Diff line number	Diff line
	@@ -39,17 +39,40 @@ namespace android {
	namespace os {		namespace os {
	namespace statsd {		namespace statsd {

	sp<android::hardware::power::stats::V1_0::IPowerStats> gPowerStatsHal = nullptr;		static sp<android::hardware::power::stats::V1_0::IPowerStats> gPowerStatsHal = nullptr;
	std::mutex gPowerStatsHalMutex;		static std::mutex gPowerStatsHalMutex;
	bool gPowerStatsExist = true; // Initialized to ensure making a first attempt.		static bool gPowerStatsExist = true; // Initialized to ensure making a first attempt.
	std::vector<RailInfo> gRailInfo;		static std::vector<RailInfo> gRailInfo;

			struct PowerStatsPullerDeathRecipient : virtual public hardware::hidl_death_recipient {
			virtual void serviceDied(uint64_t cookie,
			const wp<android::hidl::base::V1_0::IBase>& who) override {
			// The HAL just died. Reset all handles to HAL services.
			std::lock_guard<std::mutex> lock(gPowerStatsHalMutex);
			gPowerStatsHal = nullptr;
			}
			};

			static sp<PowerStatsPullerDeathRecipient> gDeathRecipient = new PowerStatsPullerDeathRecipient();

	bool getPowerStatsHal() {		static bool getPowerStatsHalLocked() {
	if (gPowerStatsHal == nullptr && gPowerStatsExist) {		if (gPowerStatsHal == nullptr && gPowerStatsExist) {
	gPowerStatsHal = android::hardware::power::stats::V1_0::IPowerStats::getService();		gPowerStatsHal = android::hardware::power::stats::V1_0::IPowerStats::getService();
	if (gPowerStatsHal == nullptr) {		if (gPowerStatsHal == nullptr) {
	ALOGW("Couldn't load power.stats HAL service");		ALOGW("Couldn't load power.stats HAL service");
	gPowerStatsExist = false;		gPowerStatsExist = false;
			} else {
			// Link death recipient to power.stats service handle
			hardware::Return<bool> linked = gPowerStatsHal->linkToDeath(gDeathRecipient, 0);
			if (!linked.isOk()) {
			ALOGE("Transaction error in linking to power.stats HAL death: %s",
			linked.description().c_str());
			gPowerStatsHal = nullptr;
			return false;
			} else if (!linked) {
			ALOGW("Unable to link to power.stats HAL death notifications");
			// We should still continue even though linking failed
			}
	}		}
	}		}
	return gPowerStatsHal != nullptr;		return gPowerStatsHal != nullptr;
	@@ -61,7 +84,7 @@ PowerStatsPuller::PowerStatsPuller() : StatsPuller(android::util::ON_DEVICE_POWE
	bool PowerStatsPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) {		bool PowerStatsPuller::PullInternal(vector<shared_ptr<LogEvent>>* data) {
	std::lock_guard<std::mutex> lock(gPowerStatsHalMutex);		std::lock_guard<std::mutex> lock(gPowerStatsHalMutex);

	if (!getPowerStatsHal()) {		if (!getPowerStatsHalLocked()) {
	ALOGE("power.stats Hal not loaded");		ALOGE("power.stats Hal not loaded");
	return false;		return false;
	}		}

cmds/statsd/src/external/SubsystemSleepStatePuller.cpp

+19 −17

Original line number	Original line	Diff line number	Diff line
	@@ -60,41 +60,43 @@ namespace android {
	namespace os {		namespace os {
	namespace statsd {		namespace statsd {

	std::function<bool(vector<shared_ptr<LogEvent>>* data)> gPuller = {};		static std::function<bool(vector<shared_ptr<LogEvent>>* data)> gPuller = {};

	sp<android::hardware::power::V1_0::IPower> gPowerHalV1_0 = nullptr;		static sp<android::hardware::power::V1_0::IPower> gPowerHalV1_0 = nullptr;
	sp<android::hardware::power::V1_1::IPower> gPowerHalV1_1 = nullptr;		static sp<android::hardware::power::V1_1::IPower> gPowerHalV1_1 = nullptr;
	sp<android::hardware::power::stats::V1_0::IPowerStats> gPowerStatsHalV1_0 = nullptr;		static sp<android::hardware::power::stats::V1_0::IPowerStats> gPowerStatsHalV1_0 = nullptr;

	std::unordered_map<uint32_t, std::string> gEntityNames = {};		static std::unordered_map<uint32_t, std::string> gEntityNames = {};
	std::unordered_map<uint32_t, std::unordered_map<uint32_t, std::string>> gStateNames = {};		static std::unordered_map<uint32_t, std::unordered_map<uint32_t, std::string>> gStateNames = {};

	std::mutex gPowerHalMutex;		static std::mutex gPowerHalMutex;

	// The caller must be holding gPowerHalMutex.		// The caller must be holding gPowerHalMutex.
	void deinitPowerStatsLocked() {		static void deinitPowerStatsLocked() {
	gPowerHalV1_0 = nullptr;		gPowerHalV1_0 = nullptr;
	gPowerHalV1_1 = nullptr;		gPowerHalV1_1 = nullptr;
	gPowerStatsHalV1_0 = nullptr;		gPowerStatsHalV1_0 = nullptr;
	}		}

	struct PowerHalDeathRecipient : virtual public hardware::hidl_death_recipient {		struct SubsystemSleepStatePullerDeathRecipient : virtual public hardware::hidl_death_recipient {
	virtual void serviceDied(uint64_t cookie,		virtual void serviceDied(uint64_t cookie,
	const wp<android::hidl::base::V1_0::IBase>& who) override {		const wp<android::hidl::base::V1_0::IBase>& who) override {

	// The HAL just died. Reset all handles to HAL services.		// The HAL just died. Reset all handles to HAL services.
	std::lock_guard<std::mutex> lock(gPowerHalMutex);		std::lock_guard<std::mutex> lock(gPowerHalMutex);
	deinitPowerStatsLocked();		deinitPowerStatsLocked();
	}		}
	};		};

	sp<PowerHalDeathRecipient> gDeathRecipient = new PowerHalDeathRecipient();		static sp<SubsystemSleepStatePullerDeathRecipient> gDeathRecipient =
			new SubsystemSleepStatePullerDeathRecipient();

	SubsystemSleepStatePuller::SubsystemSleepStatePuller() :		SubsystemSleepStatePuller::SubsystemSleepStatePuller() :
	StatsPuller(android::util::SUBSYSTEM_SLEEP_STATE) {		StatsPuller(android::util::SUBSYSTEM_SLEEP_STATE) {
	}		}

	// The caller must be holding gPowerHalMutex.		// The caller must be holding gPowerHalMutex.