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

Merge "combine wait for exec log with service exit log" am: 483d2f9a59

Browse source 
am: 010efc6a1c

Change-Id: Ia3f892e87ee0d08607a472db36b788da81987107
This commit is contained in:
Keun-young Park 2017-04-28 20:30:02 +00:00 • committed by android-build-merger
commit b85523e64e
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
init/service.cpp
View file

@ -274,10 +274,6 @@ void Service::Reap() {
std::for_each(descriptors_.begin(), descriptors_.end(), std::for_each(descriptors_.begin(), descriptors_.end(),
std::bind(&DescriptorInfo::Clean, std::placeholders::_1)); std::bind(&DescriptorInfo::Clean, std::placeholders::_1));
if (flags_ & SVC_EXEC) {
LOG(INFO) << "SVC_EXEC pid " << pid_ << " finished...";
}
if (flags_ & SVC_TEMPORARY) { if (flags_ & SVC_TEMPORARY) {
return; return;
} }
@ -1047,21 +1043,26 @@ bool ServiceManager::ReapOneProcess() {
Service* svc = FindServiceByPid(pid); Service* svc = FindServiceByPid(pid);
std::string name; std::string name;
std::string wait_string;
if (svc) { if (svc) {
name = android::base::StringPrintf("Service '%s' (pid %d)", name = android::base::StringPrintf("Service '%s' (pid %d)",
svc->name().c_str(), pid); svc->name().c_str(), pid);
if (svc->flags() & SVC_EXEC) {
wait_string =
android::base::StringPrintf(" waiting took %f seconds", exec_waiter_->duration_s());
}
} else { } else {
name = android::base::StringPrintf("Untracked pid %d", pid); name = android::base::StringPrintf("Untracked pid %d", pid);
} }
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
LOG(INFO) << name << " exited with status " << WEXITSTATUS(status); LOG(INFO) << name << " exited with status " << WEXITSTATUS(status) << wait_string;
} else if (WIFSIGNALED(status)) { } else if (WIFSIGNALED(status)) {
LOG(INFO) << name << " killed by signal " << WTERMSIG(status); LOG(INFO) << name << " killed by signal " << WTERMSIG(status) << wait_string;
} else if (WIFSTOPPED(status)) { } else if (WIFSTOPPED(status)) {
LOG(INFO) << name << " stopped by signal " << WSTOPSIG(status); LOG(INFO) << name << " stopped by signal " << WSTOPSIG(status) << wait_string;
} else { } else {
LOG(INFO) << name << " state changed"; LOG(INFO) << name << " state changed" << wait_string;
} }
if (!svc) { if (!svc) {
@ -1071,7 +1072,6 @@ bool ServiceManager::ReapOneProcess() {
svc->Reap(); svc->Reap();
if (svc->flags() & SVC_EXEC) { if (svc->flags() & SVC_EXEC) {
LOG(INFO) << "Wait for exec took " << *exec_waiter_;
exec_waiter_.reset(); exec_waiter_.reset();
} }
if (svc->flags() & SVC_TEMPORARY) { if (svc->flags() & SVC_TEMPORARY) {