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

Commit edad2bf9 authored by Tom Cherry's avatar Tom Cherry
Browse files

Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors 

Use TEMP_FAILURE_RETRY() for recvmsg() to prevent failing
unnecessarily from EINTR.  Use PLOG(ERROR) in ueventd to display the
actual error if reading from the uevent socket does fail.

Test: build
Change-Id: I64a22698ce6ffc7573f75b57803551c7b6940e30
parent 47cdf6c0

init/uevent_listener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ bool UeventListener::ReadUevent(Uevent* uevent) const { 
    int n = uevent_kernel_multicast_recv(device_fd_, msg, UEVENT_MSG_LEN);

    if (n <= 0) {

        if (errno != EAGAIN && errno != EWOULDBLOCK) {

            LOG(ERROR) << "Error reading from Uevent Fd";

            PLOG(ERROR) << "Error reading from Uevent Fd";

        }

        return false;

    }

libcutils/uevent.cpp

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ ssize_t uevent_kernel_recv(int socket, void* buffer, size_t length, bool require 
    struct ucred* cred;



    *uid = -1;

    ssize_t n = recvmsg(socket, &hdr, 0);

    ssize_t n = TEMP_FAILURE_RETRY(recvmsg(socket, &hdr, 0));

    if (n <= 0) {

        return n;

    }