summaryrefslogtreecommitdiffstats
path: root/base/process_util.h
diff options
context:
space:
mode:
authorgspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 17:50:36 +0000
committergspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 17:50:36 +0000
commitb121b1261952cf3490c3c79dad6a8d2262765101 (patch)
tree14d3644169c8533c283def215580fd0adf1c9130 /base/process_util.h
parent613c37ff0448b7767006137f3ea396c94b895fdc (diff)
downloadchromium_src-b121b1261952cf3490c3c79dad6a8d2262765101.zip
chromium_src-b121b1261952cf3490c3c79dad6a8d2262765101.tar.gz
chromium_src-b121b1261952cf3490c3c79dad6a8d2262765101.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 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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util.h')
-rw-r--r--base/process_util.h26
1 files changed, 19 insertions, 7 deletions
diff --git a/base/process_util.h b/base/process_util.h
index 77d772b..a443de6 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -131,8 +131,18 @@ const uint32 kProcessAccessWaitForTermination = 0;
// installers.
enum {
PROCESS_END_NORMAL_TERMINATION = 0,
- PROCESS_END_KILLED_BY_USER = 1,
- PROCESS_END_PROCESS_WAS_HUNG = 2
+ PROCESS_END_PROCESS_WAS_KILLED = 1,
+ PROCESS_END_PROCESS_WAS_HUNG = 2,
+};
+
+// Return status values from GetTerminationStatus
+enum TerminationStatus {
+ TERMINATION_STATUS_NORMAL_TERMINATION = 0, // zero exit status
+ TERMINATION_STATUS_PROCESS_WAS_KILLED = 1, // e.g. SIGKILL or task manager
+ TERMINATION_STATUS_PROCESS_WAS_HUNG = 2,
+ TERMINATION_STATUS_PROCESS_CRASHED = 3, // e.g. Segmentation fault
+ TERMINATION_STATUS_ABNORMAL_TERMINATION = 4, // non-zero exit status
+ TERMINATION_STATUS_STILL_RUNNING = 5 // child hasn't exited yet
};
// Returns the id of the current process.
@@ -188,7 +198,7 @@ bool AdjustOOMScore(ProcessId process, int score);
#endif
#if defined(OS_POSIX)
-// Close all file descriptors, expect those which are a destination in the
+// Close all file descriptors, except those which are a destination in the
// given multimap. Only call this function in a child process where you know
// that there aren't any other threads.
void CloseSuperfluousFds(const InjectiveMultimap& saved_map);
@@ -355,10 +365,12 @@ bool KillProcessGroup(ProcessHandle process_group_id);
bool KillProcessById(ProcessId process_id, int exit_code, bool wait);
#endif
-// Get the termination status (exit code) of the process and return true if the
-// status indicates the process crashed. |child_exited| is set to true iff the
-// child process has terminated. (|child_exited| may be NULL.)
-bool DidProcessCrash(bool* child_exited, ProcessHandle handle);
+// Get the termination status (exit code) of the process and return an
+// appropriate interpretation of the result. |exit_code| is set to
+// the status returned by waitpid() on Posix, and from
+// GetExitCodeProcess() on Windows. |exit_code| may be NULL if the
+// caller is not interested in it.
+TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code);
// Waits for process to exit. In POSIX systems, if the process hasn't been
// signaled then puts the exit code in |exit_code|; otherwise it's considered