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

Commit 310f6704 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Allow setting oom_score_adj for services spawned from init 

(cherry picked from commit f7adf8e4739812a2a4f194b17f84f4b9df42d04b)

Bug: 29831602
Change-Id: I4d24264bb6e879935a0b2adbb2e49ddf458980cf
parent 3f3ea508

init/readme.txt

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ priority <priority> 
namespace <pid|mnt>

  Enter a new PID or mount namespace when forking the service.



oom_score_adjust <value>

   Sets the child's /proc/self/oom_score_adj to the specified value,

   which must range from -1000 to 1000.





Triggers

--------

init/service.cpp

+24 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ Service::Service(const std::string& name, const std::string& classname, 
    : name_(name), classname_(classname), flags_(0), pid_(0), time_started_(0),

      time_crashed_(0), nr_crashed_(0), uid_(0), gid_(0), namespace_flags_(0),

      seclabel_(""), ioprio_class_(IoSchedClass_NONE), ioprio_pri_(0),

      priority_(0), args_(args) {

      priority_(0), oom_score_adjust_(-1000), args_(args) {

    onrestart_.InitSingleTrigger("onrestart");

}
@@ -176,7 +176,7 @@ Service::Service(const std::string& name, const std::string& classname, 
      time_started_(0), time_crashed_(0), nr_crashed_(0), uid_(uid), gid_(gid),

      supp_gids_(supp_gids), namespace_flags_(namespace_flags),

      seclabel_(seclabel), ioprio_class_(IoSchedClass_NONE), ioprio_pri_(0),

      priority_(0), args_(args) {

      priority_(0), oom_score_adjust_(-1000), args_(args) {

    onrestart_.InitSingleTrigger("onrestart");

}
@@ -419,6 +419,18 @@ bool Service::ParseNamespace(const std::vector<std::string>& args, std::string* 
    return true;

}



bool Service::ParseOomScoreAdjust(const std::vector<std::string>& args, std::string* err) {

    oom_score_adjust_ = std::stol(args[1], 0, 10);



    if (oom_score_adjust_ < -1000 || oom_score_adjust_ > 1000) {

        *err = "oom_score_adjust value must be in range -1000 - +1000";

        return false;

    }



    return true;

}





bool Service::ParseSeclabel(const std::vector<std::string>& args, std::string* err) {

    seclabel_ = args[1];

    return true;
@@ -476,6 +488,8 @@ Service::OptionParserMap::Map& Service::OptionParserMap::map() const { 
        {"keycodes",    {1,     kMax, &Service::ParseKeycodes}},

        {"oneshot",     {0,     0,    &Service::ParseOneshot}},

        {"onrestart",   {1,     kMax, &Service::ParseOnrestart}},

        {"oom_score_adjust",

                        {1,     1,    &Service::ParseOomScoreAdjust}},

        {"namespace",   {1,     2,    &Service::ParseNamespace}},

        {"seclabel",    {1,     1,    &Service::ParseSeclabel}},

        {"setenv",      {2,     2,    &Service::ParseSetenv}},
@@ -611,6 +625,14 @@ bool Service::Start() { 
        return false;

    }



    if (oom_score_adjust_ != -1000) {

        std::string oom_str = StringPrintf("%d", oom_score_adjust_);

        std::string oom_file = StringPrintf("/proc/%d/oom_score_adj", pid);

        if (!WriteStringToFile(oom_str, oom_file)) {

            PLOG(ERROR) << "couldn't write oom_score_adj: " << strerror(errno);

        }

    }



    time_started_ = gettime();

    pid_ = pid;

    flags_ |= SVC_RUNNING;

init/service.h

+3 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ private: 
    bool ParseKeycodes(const std::vector<std::string>& args, std::string* err);

    bool ParseOneshot(const std::vector<std::string>& args, std::string* err);

    bool ParseOnrestart(const std::vector<std::string>& args, std::string* err);

    bool ParseOomScoreAdjust(const std::vector<std::string>& args, std::string* err);

    bool ParseNamespace(const std::vector<std::string>& args, std::string* err);

    bool ParseSeclabel(const std::vector<std::string>& args, std::string* err);

    bool ParseSetenv(const std::vector<std::string>& args, std::string* err);
@@ -165,6 +166,8 @@ private: 
    int ioprio_pri_;

    int priority_;



    int oom_score_adjust_;



    std::vector<std::string> args_;

};