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

Merge "init: Cleanly shut down subcontext processes"

Browse source
This commit is contained in:
Treehugger Robot 2018-07-28 02:30:22 +00:00 • committed by Gerrit Code Review
commit f6b823141e
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
init/reboot.cpp
View file

@ -443,6 +443,7 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re
for (const auto& s : ServiceList::GetInstance().services_in_shutdown_order()) { for (const auto& s : ServiceList::GetInstance().services_in_shutdown_order()) {
if (!s->IsShutdownCritical()) s->Stop(); if (!s->IsShutdownCritical()) s->Stop();
} }
SubcontextTerminate();
ReapAnyOutstandingChildren(); ReapAnyOutstandingChildren();
// 3. send volume shutdown to vold // 3. send volume shutdown to vold

12
init/subcontext.cpp
View file

@ -352,6 +352,7 @@ Result<std::vector<std::string>> Subcontext::ExpandArgs(const std::vector<std::s
} }
static std::vector<Subcontext> subcontexts; static std::vector<Subcontext> subcontexts;
static bool shutting_down;
std::vector<Subcontext>* InitializeSubcontexts() { std::vector<Subcontext>* InitializeSubcontexts() {
if (SelinuxHasVendorInit()) { if (SelinuxHasVendorInit()) {
@ -365,12 +366,21 @@ std::vector<Subcontext>* InitializeSubcontexts() {
bool SubcontextChildReap(pid_t pid) { bool SubcontextChildReap(pid_t pid) {
for (auto& subcontext : subcontexts) { for (auto& subcontext : subcontexts) {
if (subcontext.pid() == pid) { if (subcontext.pid() == pid) {
subcontext.Restart(); if (!shutting_down) {
subcontext.Restart();
}
return true; return true;
} }
} }
return false; return false;
} }
void SubcontextTerminate() {
shutting_down = true;
for (auto& subcontext : subcontexts) {
kill(subcontext.pid(), SIGTERM);
}
}
} // namespace init } // namespace init
} // namespace android } // namespace android

1
init/subcontext.h
View file

@ -63,6 +63,7 @@ class Subcontext {
int SubcontextMain(int argc, char** argv, const KeywordFunctionMap* function_map); int SubcontextMain(int argc, char** argv, const KeywordFunctionMap* function_map);
std::vector<Subcontext>* InitializeSubcontexts(); std::vector<Subcontext>* InitializeSubcontexts();
bool SubcontextChildReap(pid_t pid); bool SubcontextChildReap(pid_t pid);
void SubcontextTerminate();
} // namespace init } // namespace init
} // namespace android } // namespace android