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

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

Merge changes I3c882c36,I930c668d,I29e2d51d into main 

* changes:
  init: Fix a bug in the WaitToBeReaped() logging code
  init/host_init_verifier: Fix a compiler warning
  init: Fix a compiler warning
parents 9f53082e 7ce6453a

init/host_init_verifier.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,9 +108,9 @@ passwd* getpwnam(const char* login) { // NOLINT: implementing bad function. 
    static passwd static_passwd = {

        .pw_name = static_name,

        .pw_dir = static_dir,

        .pw_shell = static_shell,

        .pw_uid = 0,

        .pw_gid = 0,

        .pw_shell = static_shell,

    };



    for (size_t n = 0; n < android_id_count; ++n) {

init/init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static void UnblockSignals() { 
static void InstallSignalFdHandler(Epoll* epoll) {

    // Applying SA_NOCLDSTOP to a defaulted SIGCHLD handler prevents the signalfd from receiving

    // SIGCHLD when a child process stops or continues (b/77867680#comment9).

    const struct sigaction act { .sa_handler = SIG_DFL, .sa_flags = SA_NOCLDSTOP };

    const struct sigaction act { .sa_flags = SA_NOCLDSTOP, .sa_handler = SIG_DFL };

    sigaction(SIGCHLD, &act, nullptr);



    sigset_t mask;

init/sigchld_handler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -139,10 +139,10 @@ void WaitToBeReaped(const std::vector<pid_t>& pids, std::chrono::milliseconds ti 
    }

    LOG(INFO) << "Waiting for " << pids.size() << " pids to be reaped took " << t << " with "

              << alive_pids.size() << " of them still running";

    for (pid_t pid : pids) {

    for (pid_t pid : alive_pids) {

        std::string status = "(no-such-pid)";

        ReadFileToString(StringPrintf("/proc/%d/status", pid), &status);

        LOG(INFO) << "Still running: " << pid << ' ' << status;

        LOG(INFO) << "Still running: " << pid << '\n' << status;

    }

}