ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: Introduce symbolic names for certain constants"

Browse source
This commit is contained in:
Bart Van Assche 2022-11-21 18:07:56 +00:00 • committed by Gerrit Code Review
commit 27630f0d0f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/service.cpp
View file

@ -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();
}

6
init/service_utils.h
View file

@ -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)