Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the active deletion action of callbacks

Browse Source 
The active deletion action will cause binder blocked in some corner
cases. As serviceDied will take care of its deletion, remove the active
deletion has no side effect and could fix the issue.

Test: none
Bug: 296817256
Change-Id: Ib30b3910202e6bbd86ac59e0e69fbeb0a890dd38
This commit is contained in:
Hang Lu
2023-08-30 18:27:25 +08:00
parent 750f415a8d
commit cef01a32a1
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
health/aidl/default/Health.cpp
View File

@@ -235,15 +235,6 @@ std::optional<bool> Health::ShouldKeepScreenOn() {
return healthd_config_->screen_on(&props);
}
namespace {
bool IsDeadObjectLogged(const ndk::ScopedAStatus& ret) {
if (ret.isOk()) return false;
if (ret.getStatus() == ::STATUS_DEAD_OBJECT) return true;
LOG(ERROR) << "Cannot call healthInfoChanged on callback: " << ret.getDescription();
return false;
}
} // namespace
//
// Subclass helpers / overrides
//
@@ -287,8 +278,10 @@ ndk::ScopedAStatus Health::registerCallback(const std::shared_ptr<IHealthInfoCal
return ndk::ScopedAStatus::ok();
}
if (auto res = callback->healthInfoChanged(health_info); IsDeadObjectLogged(res)) {
(void)unregisterCallback(callback);
auto res = callback->healthInfoChanged(health_info);
if (!res.isOk()) {
LOG(DEBUG) << "Cannot call healthInfoChanged:" << res.getDescription()
<< ". Do nothing here if callback is dead as it will be cleaned up later.";
}
return ndk::ScopedAStatus::ok();
}
@@ -335,13 +328,13 @@ ndk::ScopedAStatus Health::update() {
void Health::OnHealthInfoChanged(const HealthInfo& health_info) {
// Notify all callbacks
std::unique_lock<decltype(callbacks_lock_)> lock(callbacks_lock_);
// is_dead notifies a callback and return true if it is dead.
auto is_dead = [&](const auto& linked) {
for (const auto& linked : callbacks_) {
auto res = linked->callback()->healthInfoChanged(health_info);
return IsDeadObjectLogged(res);
};
auto it = std::remove_if(callbacks_.begin(), callbacks_.end(), is_dead);
callbacks_.erase(it, callbacks_.end()); // calls unlinkToDeath on deleted callbacks.
if (!res.isOk()) {
LOG(DEBUG) << "Cannot call healthInfoChanged:" << res.getDescription()
<< ". Do nothing here if callback is dead as it will be cleaned up later.";
}
}
lock.unlock();
// Let HalHealthLoop::OnHealthInfoChanged() adjusts uevent / wakealarm periods