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

Commit beed5689 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ia2c6a77c,I687e18ce into main 

* changes:
  init: Warn about future deprecation of memcg.swappiness
  libprocessgroup: Deprecate setProcessGroupSwappiness
parents 5c7968cc 50fdec65

init/service_parser.cpp

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ Result<void> ServiceParser::ParseSharedKallsyms(std::vector<std::string>&& args) 
}



Result<void> ServiceParser::ParseMemcgSwappiness(std::vector<std::string>&& args) {

    LOG(WARNING) << "memcg.swappiness is unsupported with memcg v2 and will be deprecated";

    if (!ParseInt(args[1], &service_->swappiness_, 0)) {

        return Error() << "swappiness value must be equal or greater than 0";

    }

libprocessgroup/include/processgroup/processgroup.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ int createProcessGroup(uid_t uid, pid_t initialPid, bool memControl = false); 


// Set various properties of a process group. For these functions to work, the process group must

// have been created by passing memControl=true to createProcessGroup.

[[deprecated("Unsupported in memcg v2")]]

bool setProcessGroupSwappiness(uid_t uid, pid_t initialPid, int swappiness);

bool setProcessGroupSoftLimit(uid_t uid, pid_t initialPid, int64_t softLimitInBytes);

bool setProcessGroupLimit(uid_t uid, pid_t initialPid, int64_t limitInBytes);