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

Commit ca29bfd8 authored by Bart Van Assche's avatar Bart Van Assche Committed by Automerger Merge Worker
Browse files

Merge "init: Introduce symbolic names for certain constants" am: 27630f0d... 

Merge "init: Introduce symbolic names for certain constants" am: 27630f0d am: f4d6de8f am: 1209f5c8

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2308681



Change-Id: I7e84d4ce7945ac35ae34007564153bc4dab114de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbbd0bb4 1209f5c8

init/service.cpp

+3 −3
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ void Service::RunService(const std::vector<Descriptor>& descriptors, 
        LOG(ERROR) << name_ << ": failed to read from notification channel: " << byte.error();

    }

    cgroups_activated.Close();

    if (!*byte) {

    if (*byte != kCgroupsActivated) {

        LOG(FATAL) << "Service '" << name_  << "' failed to start due to a fatal error";

        _exit(EXIT_FAILURE);

    }
@@ -693,7 +693,7 @@ Result<void> Service::Start() { 
                         limit_percent_ != -1 || !limit_property_.empty();

        errno = -createProcessGroup(proc_attr_.uid, pid_, use_memcg);

        if (errno != 0) {

            Result<void> result = cgroups_activated.Write(0);

            Result<void> result = cgroups_activated.Write(kActivatingCgroupsFailed);

            if (!result.ok()) {

                return Error() << "Sending notification failed: " << result.error();

            }
@@ -717,7 +717,7 @@ Result<void> Service::Start() { 
        LmkdRegister(name_, proc_attr_.uid, pid_, oom_score_adjust_);

    }



    if (Result<void> result = cgroups_activated.Write(1); !result.ok()) {

    if (Result<void> result = cgroups_activated.Write(kCgroupsActivated); !result.ok()) {

        return Error() << "Sending cgroups activated notification failed: " << result.error();

    }

init/service_utils.h

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ 
namespace android {

namespace init {



// Constants used by Service::Start() for communication between parent and child.

enum ServiceCode : uint8_t {

    kActivatingCgroupsFailed,

    kCgroupsActivated,

};



class Descriptor {

  public:

    Descriptor(const std::string& name, android::base::unique_fd fd)