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

Commit d9974eb0 authored by Bart Van Assche's avatar Bart Van Assche Committed by Gerrit Code Review
Browse files

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

parents 7732e91f 185589ba
Loading
Loading
Loading
Loading
+6 −11
Original line number Diff line number Diff line
@@ -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;