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

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

Merge "init: Fix HandleSignalFd()"

parents 745111fb 1a5b5938

init/init.cpp

+4 −1
Original line number Diff line number Diff line
@@ -747,6 +747,9 @@ static void HandleSignalFd(bool one_off) { 
    do {

        ssize_t bytes_read = TEMP_FAILURE_RETRY(read(signal_fd, &siginfo, sizeof(siginfo)));

        if (bytes_read < 0 && errno == EAGAIN) {

            if (one_off) {

                return;

            }

            auto now = std::chrono::steady_clock::now();

            std::chrono::duration<double> waited = now - started;

            if (waited >= kDiagnosticTimeout) {
@@ -772,7 +775,7 @@ static void HandleSignalFd(bool one_off) { 
            HandleSigtermSignal(siginfo);

            break;

        default:

            PLOG(ERROR) << "signal_fd: received unexpected signal " << siginfo.ssi_signo;

            LOG(ERROR) << "signal_fd: received unexpected signal " << siginfo.ssi_signo;

            break;

    }

}