StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Log when global forkserver is started and its exit status

Browse Source 
PiperOrigin-RevId: 398232735
Change-Id: Ia0628cf2dee51a94938dae82bcb392384feeb74c
This commit is contained in:
Wiktor Garbacz 2021-09-22 07:16:12 -07:00 committed by Copybara-Service
parent b470a6ece5
commit c29c510e30
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sandboxed_api/sandbox2/global_forkclient.cc
View File

@ -119,6 +119,8 @@ GlobalForkserverStartModeSet GetForkserverStartMode() {
} }
absl::StatusOr<std::unique_ptr<GlobalForkClient>> StartGlobalForkServer() { absl::StatusOr<std::unique_ptr<GlobalForkClient>> StartGlobalForkServer() {
SAPI_RAW_LOG(INFO, "Starting global forkserver");
// The fd is owned by EmbedFile // The fd is owned by EmbedFile
int exec_fd = sapi::EmbedFile::instance()->GetFdForFileToc( int exec_fd = sapi::EmbedFile::instance()->GetFdForFileToc(
forkserver_bin_embed_create()); forkserver_bin_embed_create());
@ -168,10 +170,23 @@ absl::StatusOr<std::unique_ptr<GlobalForkClient>> StartGlobalForkServer() {
} }
void WaitForForkserver(pid_t pid) { void WaitForForkserver(pid_t pid) {
pid_t wpid = TEMP_FAILURE_RETRY(waitpid(pid, nullptr, 0)); int status;
pid_t wpid = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));
if (wpid != pid) { if (wpid != pid) {
SAPI_RAW_PLOG(ERROR, "Waiting for %d failed", pid); SAPI_RAW_PLOG(ERROR, "Waiting for %d failed", pid);
} }
if (WIFEXITED(status)) {
int exit_code = WEXITSTATUS(status);
if (exit_code == 0) {
SAPI_RAW_LOG(INFO, "forkserver (pid=%d) terminated normally", pid);
} else {
SAPI_RAW_LOG(WARNING, "forkserver (pid=%d) terminated with exit code %d",
pid, exit_code);
}
} else if (WIFSIGNALED(status)) {
SAPI_RAW_LOG(WARNING, "forkserver (pid=%d) terminated by signal %d", pid,
WTERMSIG(status));
}
} }
} // namespace } // namespace