openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix race condition between restart and stop/reset."

This commit is contained in:
Tao Wu 2017-10-27 21:32:51 +00:00 committed by Gerrit Code Review
parent 7de02203cc 84b856d901
commit ee14225e0d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
init/service.cpp
View File

@ -960,6 +960,13 @@ void Service::StopOrReset(int how) {
} else {
flags_ |= how;
}
// Make sure it's in right status when a restart immediately follow a
// stop/reset or vice versa.
if (how == SVC_RESTART) {
flags_ &= (~(SVC_DISABLED | SVC_RESET));
} else {
flags_ &= (~SVC_RESTART);
}
if (pid_) {
KillProcessGroup(SIGKILL);