diff options
author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 18:25:47 +0000 |
---|---|---|
committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 18:25:47 +0000 |
commit | 22b61bab774f40b8388a5e1e5ae0c8b60f34bcc5 (patch) | |
tree | 670434c4208ff2a820b5d652274857b40c370e59 /chrome/browser/zygote_host_linux.cc | |
parent | 3de2b0deb44020852a096946bd6a7c1d6033442c (diff) | |
download | chromium_src-22b61bab774f40b8388a5e1e5ae0c8b60f34bcc5.zip chromium_src-22b61bab774f40b8388a5e1e5ae0c8b60f34bcc5.tar.gz chromium_src-22b61bab774f40b8388a5e1e5ae0c8b60f34bcc5.tar.bz2 |
Revert 63067 - 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 some new enum values to TerminationStatus enum (and named it)
in process_util.h, so it can be used as the status returned by
WhatHappenedToProcess.
- 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.
[This change was previously reviewed and LGTM'd:
http://codereview.chromium.org/3386014/show
but due to issues with "git cl push" was never committed to the tree.]
BUG=none
TEST=ran new unit test. Test passes on try servers.
Review URL: http://codereview.chromium.org/3869001
TBR=gspencer@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_host_linux.cc')
-rw-r--r-- | chrome/browser/zygote_host_linux.cc | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc index f88c597..d88c9be 100644 --- a/chrome/browser/zygote_host_linux.cc +++ b/chrome/browser/zygote_host_linux.cc @@ -306,18 +306,13 @@ void ZygoteHost::EnsureProcessTerminated(pid_t process) { PLOG(ERROR) << "write"; } -base::TerminationStatus ZygoteHost::GetTerminationStatus( - base::ProcessHandle handle, - int* exit_code) { +bool ZygoteHost::DidProcessCrash(base::ProcessHandle handle, + bool* child_exited) { DCHECK(init_); Pickle pickle; - pickle.WriteInt(kCmdGetTerminationStatus); + pickle.WriteInt(kCmdDidProcessCrash); pickle.WriteInt(handle); - // Set this now to handle the early termination cases. - if (exit_code) - *exit_code = 0; - static const unsigned kMaxMessageLength = 128; char buf[kMaxMessageLength]; ssize_t len; @@ -331,23 +326,23 @@ base::TerminationStatus ZygoteHost::GetTerminationStatus( if (len == -1) { LOG(WARNING) << "Error reading message from zygote: " << errno; - return base::TERMINATION_STATUS_NORMAL_TERMINATION; + return false; } else if (len == 0) { LOG(WARNING) << "Socket closed prematurely."; - return base::TERMINATION_STATUS_NORMAL_TERMINATION; + return false; } Pickle read_pickle(buf, len); - int status, tmp_exit_code; + bool did_crash, tmp_child_exited; void* iter = NULL; - if (!read_pickle.ReadInt(&iter, &status) || - !read_pickle.ReadInt(&iter, &tmp_exit_code)) { - LOG(WARNING) << "Error parsing GetTerminationStatus response from zygote."; - return base::TERMINATION_STATUS_NORMAL_TERMINATION; + if (!read_pickle.ReadBool(&iter, &did_crash) || + !read_pickle.ReadBool(&iter, &tmp_child_exited)) { + LOG(WARNING) << "Error parsing DidProcessCrash response from zygote."; + return false; } - if (exit_code) - *exit_code = tmp_exit_code; + if (child_exited) + *child_exited = tmp_child_exited; - return static_cast<base::TerminationStatus>(status); + return did_crash; } |