diff options
author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:42:23 +0000 |
---|---|---|
committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 00:42:23 +0000 |
commit | 443b80e00142dab08385eba06fcea79c96bbee6b (patch) | |
tree | 157caafda0fc699ff453d0d9666d19f2eeff8869 /base/process_util_posix.cc | |
parent | 458a4362fecfe99bd7bc7e9d918a50fc653b4519 (diff) | |
download | chromium_src-443b80e00142dab08385eba06fcea79c96bbee6b.zip chromium_src-443b80e00142dab08385eba06fcea79c96bbee6b.tar.gz chromium_src-443b80e00142dab08385eba06fcea79c96bbee6b.tar.bz2 |
This adds some plumbing for propagating the status and error code of a renderer process that went away so that we can tell at the UI level what happened to the tab: did it crash, or was it killed by the OOM killer (or some other reason). This is in preparation for implementing a new UI for when a process is killed by the OOM on ChromeOS which handles it differently from a crash.
Most of the changes are modifications of the argument list to include a status and error code for the exited process, but in addition the following was done:
- Changed the name of DidProcessCrash to GetTerminationStatus.
- Added TerminationStatus enum in process_util.h, so it can be used as the status returned by GetTerminationStatus.
- Improved process_util_unittest to actually test for crashing and terminated processes on all platforms.
- Added a new notification for renderers that were killed.
- Added error code information to crash notification.
- Added status and error code information to renderer IPC message for RenderViewGone.
- Added a UMA histogram count for number of renderer kills.
BUG=http://crosbug.com/8505
TEST=ran new unit test. Test passes on try servers.
Review URL: http://codereview.chromium.org/5172009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_posix.cc')
-rw-r--r-- | base/process_util_posix.cc | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index 92ef964..3d29674 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -237,6 +237,8 @@ bool KillProcess(ProcessHandle process_id, int exit_code, bool wait) { sleep_ms *= 2; } + // If we're waiting and the child hasn't died by now, force it + // with a SIGKILL. if (!exited) result = kill(process_id, SIGKILL) == 0; } @@ -634,40 +636,45 @@ void RaiseProcessToHighPriority() { // setpriority() or sched_getscheduler, but these all require extra rights. } -bool DidProcessCrash(bool* child_exited, ProcessHandle handle) { - int status; +TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) { + int status = 0; const pid_t result = HANDLE_EINTR(waitpid(handle, &status, WNOHANG)); if (result == -1) { PLOG(ERROR) << "waitpid(" << handle << ")"; - if (child_exited) - *child_exited = false; - return false; + if (exit_code) + *exit_code = 0; + return TERMINATION_STATUS_NORMAL_TERMINATION; } else if (result == 0) { // the child hasn't exited yet. - if (child_exited) - *child_exited = false; - return false; + if (exit_code) + *exit_code = 0; + return TERMINATION_STATUS_STILL_RUNNING; } - if (child_exited) - *child_exited = true; + if (exit_code) + *exit_code = status; if (WIFSIGNALED(status)) { switch (WTERMSIG(status)) { - case SIGSEGV: - case SIGILL: case SIGABRT: + case SIGBUS: case SIGFPE: - return true; + case SIGILL: + case SIGSEGV: + return TERMINATION_STATUS_PROCESS_CRASHED; + case SIGINT: + case SIGKILL: + case SIGTERM: + return TERMINATION_STATUS_PROCESS_WAS_KILLED; default: - return false; + break; } } - if (WIFEXITED(status)) - return WEXITSTATUS(status) != 0; + if (WIFEXITED(status) && WEXITSTATUS(status) != 0) + return TERMINATION_STATUS_ABNORMAL_TERMINATION; - return false; + return TERMINATION_STATUS_NORMAL_TERMINATION; } bool WaitForExitCode(ProcessHandle handle, int* exit_code) { |