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/nacl_host | |
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/nacl_host')
-rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 7 | ||||
-rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index ded7390..df661e4 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -163,10 +163,11 @@ void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) { OnProcessLaunched(); } -bool NaClProcessHost::DidChildCrash() { +base::TerminationStatus NaClProcessHost::GetChildTerminationStatus( + int* exit_code) { if (running_on_wow64_) - return base::DidProcessCrash(NULL, handle()); - return BrowserChildProcessHost::DidChildCrash(); + return base::GetTerminationStatus(handle(), exit_code); + return BrowserChildProcessHost::GetChildTerminationStatus(exit_code); } void NaClProcessHost::OnChildDied() { diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index 3b35bf7..5d6cc35 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -37,7 +37,7 @@ class NaClProcessHost : public BrowserChildProcessHost { void OnProcessLaunchedByBroker(base::ProcessHandle handle); protected: - virtual bool DidChildCrash(); + virtual base::TerminationStatus GetChildTerminationStatus(int* exit_code); virtual void OnChildDied(); private: |