tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "init: clean up DelayService()" into main am: fdbf5a5eac am: 30e996b9a4 am: 31f88e858a

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

Change-Id: I4e70050bb359e58fee78356845cafc5a9508f70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han 2023-08-22 00:35:51 +00:00 committed by Automerger Merge Worker
commit 4ff5fd38cc
4 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/builtins.cpp
View file

@ -1304,8 +1304,7 @@ static Result<void> do_perform_apex_config(const BuiltinArguments& args) {
}
if (!bootstrap) {
// Now start delayed services
ServiceList::GetInstance().MarkServicesUpdate();
ServiceList::GetInstance().StartDelayedServices();
}
return {};
}

4
init/service.cpp
View file

@ -420,7 +420,7 @@ Result<void> Service::ExecStart() {
}
});
if (is_updatable() && !ServiceList::GetInstance().IsServicesUpdated()) {
if (is_updatable() && !IsDefaultMountNamespaceReady()) {
// Don't delay the service for ExecStart() as the semantic is that
// the caller might depend on the side effect of the execution.
return Error() << "Cannot start an updatable service '" << name_
@ -581,7 +581,7 @@ Result<void> Service::Start() {
}
});
if (is_updatable() && !ServiceList::GetInstance().IsServicesUpdated()) {
if (is_updatable() && !IsDefaultMountNamespaceReady()) {
ServiceList::GetInstance().DelayService(*this);
return Error() << "Cannot start an updatable service '" << name_
<< "' before configs from APEXes are all loaded. "

7
init/service_list.cpp
View file

@ -76,10 +76,7 @@ bool ServiceList::IsPostData() {
return post_data_;
}
void ServiceList::MarkServicesUpdate() {
services_update_finished_ = true;
// start the delayed services
void ServiceList::StartDelayedServices() {
for (const auto& name : delayed_service_names_) {
Service* service = FindService(name);
if (service == nullptr) {
@ -94,7 +91,7 @@ void ServiceList::MarkServicesUpdate() {
}
void ServiceList::DelayService(const Service& service) {
if (services_update_finished_) {
if (IsDefaultMountNamespaceReady()) {
LOG(ERROR) << "Cannot delay the start of service '" << service.name()
<< "' because all services are already updated. Ignoring.";
return;

9
init/service_list.h
View file

@ -85,14 +85,10 @@ class ServiceList {
void MarkPostData();
bool IsPostData();
void MarkServicesUpdate();
bool IsServicesUpdated() const { return services_update_finished_; }
void DelayService(const Service& service);
void StartDelayedServices();
void ResetState() {
post_data_ = false;
services_update_finished_ = false;
}
void ResetState() { post_data_ = false; }
auto size() const { return services_.size(); }
@ -100,7 +96,6 @@ class ServiceList {
std::vector<std::unique_ptr<Service>> services_;
bool post_data_ = false;
bool services_update_finished_ = false;
std::vector<std::string> delayed_service_names_;
};