Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 03:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1461459: Add nightly-only MOZ_CRASH statements in base::LaunchApp on macOS to investigate failures to asynchronously launch content processes. r=jld

Browse Source
This commit is contained in:
Stephen A Pohl 2018-06-15 10:46:33 -07:00
parent d9e98a1219
commit 80b1014efb
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ipc/chromium/src/base/process_util_mac.mm
View File

@ -40,6 +40,9 @@ bool LaunchApp(const std::vector<std::string>& argv,
posix_spawn_file_actions_t file_actions;
if (posix_spawn_file_actions_init(&file_actions) != 0) {
#ifdef ASYNC_CONTENTPROC_LAUNCH
MOZ_CRASH("base::LaunchApp: posix_spawn_file_actions_init failed");
#endif
return false;
}
auto file_actions_guard = mozilla::MakeScopeExit([&file_actions] {
@ -58,6 +61,9 @@ bool LaunchApp(const std::vector<std::string>& argv,
}
} else {
if (posix_spawn_file_actions_adddup2(&file_actions, src_fd, dest_fd) != 0) {
#ifdef ASYNC_CONTENTPROC_LAUNCH
MOZ_CRASH("base::LaunchApp: posix_spawn_file_actions_adddup2 failed");
#endif
return false;
}
}
@ -66,6 +72,9 @@ bool LaunchApp(const std::vector<std::string>& argv,
// Initialize spawn attributes.
posix_spawnattr_t spawnattr;
if (posix_spawnattr_init(&spawnattr) != 0) {
#ifdef ASYNC_CONTENTPROC_LAUNCH
MOZ_CRASH("base::LaunchApp: posix_spawnattr_init failed");
#endif
return false;
}
auto spawnattr_guard = mozilla::MakeScopeExit([&spawnattr] {
@ -76,12 +85,19 @@ bool LaunchApp(const std::vector<std::string>& argv,
// that aren't named in `file_actions`. (This is an Apple-specific
// extension to posix_spawn.)
if (posix_spawnattr_setflags(&spawnattr, POSIX_SPAWN_CLOEXEC_DEFAULT) != 0) {
#ifdef ASYNC_CONTENTPROC_LAUNCH
MOZ_CRASH("base::LaunchApp: posix_spawnattr_setflags failed");
#endif
return false;
}
// Exempt std{in,out,err} from being closed by POSIX_SPAWN_CLOEXEC_DEFAULT.
for (int fd = 0; fd <= STDERR_FILENO; ++fd) {
if (posix_spawn_file_actions_addinherit_np(&file_actions, fd) != 0) {
#ifdef ASYNC_CONTENTPROC_LAUNCH
MOZ_CRASH("base::LaunchApp: posix_spawn_file_actions_addinherit_np "
"failed");
#endif
return false;
}
}
@ -96,6 +112,16 @@ bool LaunchApp(const std::vector<std::string>& argv,
bool process_handle_valid = pid > 0;
if (!spawn_succeeded || !process_handle_valid) {
#ifdef ASYNC_CONTENTPROC_LAUNCH
if (!spawn_succeeded && !process_handle_valid) {
MOZ_CRASH("base::LaunchApp: spawn_succeeded is false and "
"process_handle_valid is false");
} else if (!spawn_succeeded) {
MOZ_CRASH("base::LaunchApp: spawn_succeeded is false");
} else {
MOZ_CRASH("base::LaunchApp: process_handle_valid is false");
}
#endif
retval = false;
} else {
gProcessLog.print("==> process %d launched child process %d\n",