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

Merge "Revert "libhealthloop: Handle netlink receive buffer overflows"" into main

Browse Source
This commit is contained in:
Bart Van Assche
2024-08-27 15:38:47 +00:00
committed by Gerrit Code Review
parent 7732e91f50 185589ba6c
commit d9974eb049
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
health/utils/libhealthloop/HealthLoop.cpp
View File

@@ -61,13 +61,14 @@ int HealthLoop::RegisterEvent(int fd, BoundFunction func, EventWakeup wakeup) {
EventHandler{this, fd, std::move(func)}))
.get();
struct epoll_event ev = {
.events = EPOLLIN | EPOLLERR,
.data.ptr = reinterpret_cast<void*>(event_handler),
};
struct epoll_event ev;
ev.events = EPOLLIN;
if (wakeup == EVENT_WAKEUP_FD) ev.events |= EPOLLWAKEUP;
ev.data.ptr = reinterpret_cast<void*>(event_handler);
if (epoll_ctl(epollfd_, EPOLL_CTL_ADD, fd, &ev) == -1) {
KLOG_ERROR(LOG_TAG, "epoll_ctl failed; errno=%d\n", errno);
return -1;
@@ -121,15 +122,9 @@ void HealthLoop::PeriodicChores() {
}
#define UEVENT_MSG_LEN 2048
void HealthLoop::UeventEvent(uint32_t epevents) {
void HealthLoop::UeventEvent(uint32_t /*epevents*/) {
// No need to lock because uevent_fd_ is guaranteed to be initialized.
if (epevents & EPOLLERR) {
// The netlink receive buffer overflowed.
ScheduleBatteryUpdate();
return;
}
char msg[UEVENT_MSG_LEN + 2];
char* cp;
int n;