fe8154175c
In the future, property service may run in its own thread or process, which means that PropertyChildReap() needs to be refactored to not run as part of the init signal handler. The new method spawns a new thread that handles the queue of paths that require restorecon. It then communicates back to property service via android::base::SetProperty(). Property service distinguishes the thread from other callers of SetProperty() by checking the pid in the credentials for the socket connection, thus avoiding dependencies on the rest of init. The new method also drops the genericness, since restorecon is the only function that we should ever need to run asynchronously Test: async restorecon works, including with queued requests Change-Id: I2ca00459969e77b1820776dac23d0a0d974e330b
104 lines
3.3 KiB
C++
104 lines
3.3 KiB
C++
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "sigchld_handler.h"
|
|
|
|
#include <signal.h>
|
|
#include <string.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <unistd.h>
|
|
|
|
#include <android-base/chrono_utils.h>
|
|
#include <android-base/logging.h>
|
|
#include <android-base/scopeguard.h>
|
|
#include <android-base/stringprintf.h>
|
|
|
|
#include "init.h"
|
|
#include "service.h"
|
|
|
|
using android::base::StringPrintf;
|
|
using android::base::boot_clock;
|
|
using android::base::make_scope_guard;
|
|
|
|
namespace android {
|
|
namespace init {
|
|
|
|
static bool ReapOneProcess() {
|
|
siginfo_t siginfo = {};
|
|
// This returns a zombie pid or informs us that there are no zombies left to be reaped.
|
|
// It does NOT reap the pid; that is done below.
|
|
if (TEMP_FAILURE_RETRY(waitid(P_ALL, 0, &siginfo, WEXITED | WNOHANG | WNOWAIT)) != 0) {
|
|
PLOG(ERROR) << "waitid failed";
|
|
return false;
|
|
}
|
|
|
|
auto pid = siginfo.si_pid;
|
|
if (pid == 0) return false;
|
|
|
|
// At this point we know we have a zombie pid, so we use this scopeguard to reap the pid
|
|
// whenever the function returns from this point forward.
|
|
// We do NOT want to reap the zombie earlier as in Service::Reap(), we kill(-pid, ...) and we
|
|
// want the pid to remain valid throughout that (and potentially future) usages.
|
|
auto reaper = make_scope_guard([pid] { TEMP_FAILURE_RETRY(waitpid(pid, nullptr, WNOHANG)); });
|
|
|
|
std::string name;
|
|
std::string wait_string;
|
|
Service* service = nullptr;
|
|
|
|
if (SubcontextChildReap(pid)) {
|
|
name = "Subcontext";
|
|
} else {
|
|
service = ServiceList::GetInstance().FindService(pid, &Service::pid);
|
|
|
|
if (service) {
|
|
name = StringPrintf("Service '%s' (pid %d)", service->name().c_str(), pid);
|
|
if (service->flags() & SVC_EXEC) {
|
|
auto exec_duration = boot_clock::now() - service->time_started();
|
|
auto exec_duration_ms =
|
|
std::chrono::duration_cast<std::chrono::milliseconds>(exec_duration).count();
|
|
wait_string = StringPrintf(" waiting took %f seconds", exec_duration_ms / 1000.0f);
|
|
}
|
|
} else {
|
|
name = StringPrintf("Untracked pid %d", pid);
|
|
}
|
|
}
|
|
|
|
if (siginfo.si_code == CLD_EXITED) {
|
|
LOG(INFO) << name << " exited with status " << siginfo.si_status << wait_string;
|
|
} else {
|
|
LOG(INFO) << name << " received signal " << siginfo.si_status << wait_string;
|
|
}
|
|
|
|
if (!service) return true;
|
|
|
|
service->Reap(siginfo);
|
|
|
|
if (service->flags() & SVC_TEMPORARY) {
|
|
ServiceList::GetInstance().RemoveService(*service);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void ReapAnyOutstandingChildren() {
|
|
while (ReapOneProcess()) {
|
|
}
|
|
}
|
|
|
|
} // namespace init
|
|
} // namespace android
|