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 /chrome/browser/browser_child_process_host.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 'chrome/browser/browser_child_process_host.cc')
-rw-r--r-- | chrome/browser/browser_child_process_host.cc | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/chrome/browser/browser_child_process_host.cc b/chrome/browser/browser_child_process_host.cc index 6ad0c44..6b7d47b 100644 --- a/chrome/browser/browser_child_process_host.cc +++ b/chrome/browser/browser_child_process_host.cc @@ -141,18 +141,34 @@ void BrowserChildProcessHost::Notify(NotificationType type) { BrowserThread::UI, FROM_HERE, new ChildNotificationTask(type, this)); } -bool BrowserChildProcessHost::DidChildCrash() { - return child_process_->DidProcessCrash(); +base::TerminationStatus BrowserChildProcessHost::GetChildTerminationStatus( + int* exit_code) { + return child_process_->GetChildTerminationStatus(exit_code); } void BrowserChildProcessHost::OnChildDied() { if (handle() != base::kNullProcessHandle) { - bool did_crash = DidChildCrash(); - if (did_crash) { - OnProcessCrashed(); - // Report that this child process crashed. - Notify(NotificationType::CHILD_PROCESS_CRASHED); - UMA_HISTOGRAM_COUNTS("ChildProcess.Crashes", this->type()); + int exit_code; + base::TerminationStatus status = GetChildTerminationStatus(&exit_code); + switch (status) { + case base::TERMINATION_STATUS_PROCESS_CRASHED: { + OnProcessCrashed(exit_code); + + // Report that this child process crashed. + Notify(NotificationType::CHILD_PROCESS_CRASHED); + UMA_HISTOGRAM_COUNTS("ChildProcess.Crashes", this->type()); + break; + } + case base::TERMINATION_STATUS_PROCESS_WAS_KILLED: { + OnProcessWasKilled(exit_code); + + // Report that this child process was killed. + Notify(NotificationType::CHILD_PROCESS_WAS_KILLED); + UMA_HISTOGRAM_COUNTS("ChildProcess.Kills", this->type()); + break; + } + default: + break; } // Notify in the main loop of the disconnection. Notify(NotificationType::CHILD_PROCESS_HOST_DISCONNECTED); |