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

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

Merge changes If286ae5d,I0c89907e into main 

* changes:
  libhealthloop: Reduce the size of the uevent receive buffer
  libhealthloop: Modify receive buffer overflow handling
parents 8ab55b06 41877552

health/utils/libhealthloop/HealthLoop.cpp

+5 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int HealthLoop::RegisterEvent(int fd, BoundFunction func, EventWakeup wakeup) { 
                                  .get();



    struct epoll_event ev = {

        .events = EPOLLIN,

        .events = EPOLLIN | EPOLLERR,

        .data.ptr = reinterpret_cast<void*>(event_handler),

    };
@@ -128,6 +128,9 @@ bool HealthLoop::RecvUevents() { 
    for (;;) {

        char msg[kUeventMsgLen + 2];

        int n = uevent_kernel_multicast_recv(uevent_fd_, msg, kUeventMsgLen);

        if (n < 0 && errno == ENOBUFS) {

            update_stats = true;

        }

        if (n <= 0) return update_stats;

        if (n >= kUeventMsgLen) {

            // too long -- discard
@@ -177,7 +180,7 @@ Result<void> HealthLoop::AttachFilter(int uevent_fd) { 
}



void HealthLoop::UeventInit(void) {

    uevent_fd_.reset(uevent_create_socket(64 * 1024, true));

    uevent_fd_.reset(uevent_create_socket(kUeventMsgLen, true));



    if (uevent_fd_ < 0) {

        KLOG_ERROR(LOG_TAG, "uevent_init: uevent_open_socket failed\n");