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

Merge "Fix one race condition between start and stop."

Browse source
This commit is contained in:
Tao Wu 2017-10-26 22:48:51 +00:00 • committed by Gerrit Code Review
commit 876b13d0ec
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/service.cpp
View file

@ -720,14 +720,20 @@ Result<Success> Service::ExecStart() {
} }
Result<Success> Service::Start() { Result<Success> Service::Start() {
bool disabled = (flags_ & (SVC_DISABLED | SVC_RESET));
// Starting a service removes it from the disabled or reset state and // Starting a service removes it from the disabled or reset state and
// immediately takes it out of the restarting state if it was in there. // immediately takes it out of the restarting state if it was in there.
flags_ &= (~(SVC_DISABLED|SVC_RESTARTING|SVC_RESET|SVC_RESTART|SVC_DISABLED_START)); flags_ &= (~(SVC_DISABLED|SVC_RESTARTING|SVC_RESET|SVC_RESTART|SVC_DISABLED_START));
// Running processes require no additional work --- if they're in the // Running processes require no additional work --- if they're in the
// process of exiting, we've ensured that they will immediately restart // process of exiting, we've ensured that they will immediately restart
// on exit, unless they are ONESHOT. // on exit, unless they are ONESHOT. For ONESHOT service, if it's in
// stopping status, we just set SVC_RESTART flag so it will get restarted
// in Reap().
if (flags_ & SVC_RUNNING) { if (flags_ & SVC_RUNNING) {
if ((flags_ & SVC_ONESHOT) && disabled) {
flags_ |= SVC_RESTART;
}
// It is not an error to try to start a service that is already running. // It is not an error to try to start a service that is already running.
return Success(); return Success();
} }