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

4 files changed, 66 insertions, 239 deletions

diff --git a/base/process_util.h b/base/process_util.h
index a443de6..77d772b 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -131,18 +131,8 @@ const uint32 kProcessAccessWaitForTermination     = 0;
 // installers.
 enum {
   PROCESS_END_NORMAL_TERMINATION = 0,
-  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
+  PROCESS_END_KILLED_BY_USER     = 1,
+  PROCESS_END_PROCESS_WAS_HUNG   = 2
 };
 
 // Returns the id of the current process.
@@ -198,7 +188,7 @@ bool AdjustOOMScore(ProcessId process, int score);
 #endif
 
 #if defined(OS_POSIX)
-// Close all file descriptors, except those which are a destination in the
+// Close all file descriptors, expect 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);
@@ -365,12 +355,10 @@ 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 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);
+// 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);
 
 // 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
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index c2242f1..b1dbabd 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -193,8 +193,6 @@ 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;
   }
@@ -588,45 +586,40 @@ void RaiseProcessToHighPriority() {
   // setpriority() or sched_getscheduler, but these all require extra rights.
 }
 
-TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
-  int status = 0;
+bool DidProcessCrash(bool* child_exited, ProcessHandle handle) {
+  int status;
   const pid_t result = HANDLE_EINTR(waitpid(handle, &status, WNOHANG));
   if (result == -1) {
     PLOG(ERROR) << "waitpid(" << handle << ")";
-    if (exit_code)
-      *exit_code = 0;
-    return TERMINATION_STATUS_NORMAL_TERMINATION;
+    if (child_exited)
+      *child_exited = false;
+    return false;
   } else if (result == 0) {
     // the child hasn't exited yet.
-    if (exit_code)
-      *exit_code = 0;
-    return TERMINATION_STATUS_STILL_RUNNING;
+    if (child_exited)
+      *child_exited = false;
+    return false;
   }
 
-  if (exit_code)
-    *exit_code = status;
+  if (child_exited)
+    *child_exited = true;
 
   if (WIFSIGNALED(status)) {
     switch (WTERMSIG(status)) {
+      case SIGSEGV:
+      case SIGILL:
       case SIGABRT:
-      case SIGBUS:
       case SIGFPE:
-      case SIGILL:
-      case SIGSEGV:
-        return TERMINATION_STATUS_PROCESS_CRASHED;
-      case SIGINT:
-      case SIGKILL:
-      case SIGTERM:
-        return TERMINATION_STATUS_PROCESS_WAS_KILLED;
+        return true;
       default:
-        break;
+        return false;
     }
   }
 
-  if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
-    return TERMINATION_STATUS_ABNORMAL_TERMINATION;
+  if (WIFEXITED(status))
+    return WEXITSTATUS(status) != 0;
 
-  return TERMINATION_STATUS_NORMAL_TERMINATION;
+  return false;
 }
 
 bool WaitForExitCode(ProcessHandle handle, int* exit_code) {
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index 1bd568e..e92459c 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -7,7 +7,6 @@
 #include <limits>
 
 #include "base/command_line.h"
-#include "base/debug_util.h"
 #include "base/eintr_wrapper.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ -28,7 +27,6 @@
 #if defined(OS_POSIX)
 #include <dlfcn.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 #endif
@@ -43,24 +41,11 @@
 namespace {
 
 #if defined(OS_WIN)
-const wchar_t kProcessName[] = L"base_unittests.exe";
+const wchar_t* const kProcessName = L"base_unittests.exe";
 #else
-const wchar_t kProcessName[] = L"base_unittests";
+const wchar_t* const kProcessName = L"base_unittests";
 #endif  // defined(OS_WIN)
 
-const char kSignalFileSlow[] = "SlowChildProcess.die";
-const char kSignalFileCrash[] = "CrashingChildProcess.die";
-const char kSignalFileKill[] = "KilledChildProcess.die";
-
-#if defined(OS_WIN)
-const int kExpectedStillRunningExitCode = 0x102;
-#else
-const int kExpectedStillRunningExitCode = 0;
-#endif
-
-// The longest we'll wait for a process, in milliseconds.
-const int kMaxWaitTimeMs = 5000;
-
 // Sleeps until file filename is created.
 void WaitToDie(const char* filename) {
   FILE *fp;
@@ -77,27 +62,6 @@ void SignalChildren(const char* filename) {
   fclose(fp);
 }
 
-// Using a pipe to the child to wait for an event was considered, but
-// there were cases in the past where pipes caused problems (other
-// libraries closing the fds, child deadlocking). This is a simple
-// case, so it's not worth the risk.  Using wait loops is discouraged
-// in most instances.
-base::TerminationStatus WaitForChildTermination(base::ProcessHandle handle,
-                                                int* exit_code) {
-  // Now we wait until the result is something other than STILL_RUNNING.
-  base::TerminationStatus status = base::TERMINATION_STATUS_STILL_RUNNING;
-  const int kIntervalMs = 20;
-  int waited = 0;
-  do {
-    status = base::GetTerminationStatus(handle, exit_code);
-    PlatformThread::Sleep(kIntervalMs);
-    waited += kIntervalMs;
-  } while (status == base::TERMINATION_STATUS_STILL_RUNNING &&
-           waited < kMaxWaitTimeMs);
-
-  return status;
-}
-
 }  // namespace
 
 class ProcessUtilTest : public base::MultiProcessTest {
@@ -115,145 +79,40 @@ MULTIPROCESS_TEST_MAIN(SimpleChildProcess) {
 TEST_F(ProcessUtilTest, SpawnChild) {
   base::ProcessHandle handle = this->SpawnChild("SimpleChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
-  EXPECT_TRUE(base::WaitForSingleProcess(handle, kMaxWaitTimeMs));
+  EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
   base::CloseProcessHandle(handle);
 }
 
 MULTIPROCESS_TEST_MAIN(SlowChildProcess) {
-  WaitToDie(kSignalFileSlow);
+  WaitToDie("SlowChildProcess.die");
   return 0;
 }
 
 TEST_F(ProcessUtilTest, KillSlowChild) {
-  remove(kSignalFileSlow);
+  remove("SlowChildProcess.die");
   base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
-  SignalChildren(kSignalFileSlow);
-  EXPECT_TRUE(base::WaitForSingleProcess(handle, kMaxWaitTimeMs));
+  SignalChildren("SlowChildProcess.die");
+  EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
   base::CloseProcessHandle(handle);
-  remove(kSignalFileSlow);
+  remove("SlowChildProcess.die");
 }
 
-TEST_F(ProcessUtilTest, GetTerminationStatusExit) {
-  remove(kSignalFileSlow);
+TEST_F(ProcessUtilTest, DidProcessCrash) {
+  remove("SlowChildProcess.die");
   base::ProcessHandle handle = this->SpawnChild("SlowChildProcess", false);
   ASSERT_NE(base::kNullProcessHandle, handle);
 
-  int exit_code = 42;
-  EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING,
-            base::GetTerminationStatus(handle, &exit_code));
-  EXPECT_EQ(kExpectedStillRunningExitCode, exit_code);
-
-  SignalChildren(kSignalFileSlow);
-  exit_code = 42;
-  base::TerminationStatus status =
-      WaitForChildTermination(handle, &exit_code);
-  EXPECT_EQ(base::TERMINATION_STATUS_NORMAL_TERMINATION, status);
-  EXPECT_EQ(0, exit_code);
-  base::CloseProcessHandle(handle);
-  remove(kSignalFileSlow);
-}
-
-MULTIPROCESS_TEST_MAIN(CrashingChildProcess) {
-  WaitToDie(kSignalFileCrash);
-#if defined(OS_MACOSX)
-  // Have to reset the exception ports on mac so we get a crash.
-  base::RestoreDefaultExceptionHandler();
-  // We disable crash dumps because we don't really need one if we are
-  // *trying* to cause a crash.
-  DebugUtil::DisableOSCrashDumps();
-  // Mac gets a SIGBUS instead of SIGSEGV on x86 (but not x86_64), so
-  // we have to disable handling for both.
-  ::signal(SIGBUS, SIG_DFL);
-#endif
-#if defined(OS_POSIX)
-  // Have to disable to signal handler for segv so we can get a crash
-  // instead of an abnormal termination through the crash dump handler.
-  ::signal(SIGSEGV, SIG_DFL);
-#endif
-  // Make this process have a segmentation fault.
-  int* oops = NULL;
-  *oops = 0xDEAD;
-  return 1;
-}
-
-TEST_F(ProcessUtilTest, GetTerminationStatusCrash) {
-  remove(kSignalFileCrash);
-  base::ProcessHandle handle = this->SpawnChild("CrashingChildProcess",
-                                                false);
-  ASSERT_NE(base::kNullProcessHandle, handle);
+  bool child_exited = true;
+  EXPECT_FALSE(base::DidProcessCrash(&child_exited, handle));
+  EXPECT_FALSE(child_exited);
 
-  int exit_code = 42;
-  EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING,
-            base::GetTerminationStatus(handle, &exit_code));
-  EXPECT_EQ(kExpectedStillRunningExitCode, exit_code);
+  SignalChildren("SlowChildProcess.die");
+  EXPECT_TRUE(base::WaitForSingleProcess(handle, 5000));
 
-  SignalChildren(kSignalFileCrash);
-  exit_code = 42;
-  base::TerminationStatus status =
-      WaitForChildTermination(handle, &exit_code);
-  EXPECT_EQ(base::TERMINATION_STATUS_PROCESS_CRASHED, status);
-
-#if defined(OS_WIN)
-  EXPECT_EQ(0xc0000005, exit_code);
-#elif defined(OS_POSIX)
-  int signaled = WIFSIGNALED(exit_code);
-  EXPECT_NE(0, signaled);
-  int signal = WTERMSIG(exit_code);
-#if defined(OS_MACOSX)
-  // Mac gets a SIGBUS instead of SIGSEGV on x86 (but not x86_64), so
-  // we have to expect either one.
-  EXPECT_TRUE(signal == SIGBUS || signal == SIGSEGV);
-#else
-  EXPECT_EQ(SIGSEGV, signal);
-#endif
-#endif
-  base::CloseProcessHandle(handle);
-
-  // Reset signal handlers back to "normal".
-  base::EnableInProcessStackDumping();
-  remove(kSignalFileCrash);
-}
-
-MULTIPROCESS_TEST_MAIN(KilledChildProcess) {
-  WaitToDie(kSignalFileKill);
-#if defined(OS_WIN)
-  // Kill ourselves.
-  HANDLE handle = ::OpenProcess(PROCESS_ALL_ACCESS, 0, ::GetCurrentProcessId());
-  ::TerminateProcess(handle, base::PROCESS_END_PROCESS_WAS_KILLED);
-#elif defined(OS_POSIX)
-  // Send a SIGKILL to this process, just like the OOM killer would.
-  ::kill(getpid(), SIGKILL);
-#endif
-  return 1;
-}
-
-TEST_F(ProcessUtilTest, GetTerminationStatusKill) {
-  remove(kSignalFileKill);
-  base::ProcessHandle handle = this->SpawnChild("KilledChildProcess",
-                                                false);
-  ASSERT_NE(base::kNullProcessHandle, handle);
-
-  int exit_code = 42;
-  EXPECT_EQ(base::TERMINATION_STATUS_STILL_RUNNING,
-            base::GetTerminationStatus(handle, &exit_code));
-  EXPECT_EQ(kExpectedStillRunningExitCode, exit_code);
-
-  SignalChildren(kSignalFileKill);
-  exit_code = 42;
-  base::TerminationStatus status =
-      WaitForChildTermination(handle, &exit_code);
-  EXPECT_EQ(base::TERMINATION_STATUS_PROCESS_WAS_KILLED, status);
-#if defined(OS_WIN)
-  EXPECT_EQ(base::PROCESS_END_PROCESS_WAS_KILLED, exit_code);
-#elif defined(OS_POSIX)
-  int signaled = WIFSIGNALED(exit_code);
-  EXPECT_NE(0, signaled);
-  int signal = WTERMSIG(exit_code);
-  EXPECT_EQ(SIGKILL, signal);
-#endif
+  EXPECT_FALSE(base::DidProcessCrash(&child_exited, handle));
   base::CloseProcessHandle(handle);
-  remove(kSignalFileKill);
+  remove("SlowChildProcess.die");
 }
 
 // Ensure that the priority of a process is restored correctly after
diff --git a/base/process_util_win.cc b/base/process_util_win.cc
index 3c0663f..92077b1 100644
--- a/base/process_util_win.cc
+++ b/base/process_util_win.cc
@@ -394,33 +394,22 @@ bool KillProcess(ProcessHandle process, int exit_code, bool wait) {
   return result;
 }
 
-TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
-  DWORD tmp_exit_code = 0;
+bool DidProcessCrash(bool* child_exited, ProcessHandle handle) {
+  DWORD exitcode = 0;
 
-  if (!::GetExitCodeProcess(handle, &tmp_exit_code)) {
+  if (!::GetExitCodeProcess(handle, &exitcode)) {
     NOTREACHED();
-    if (exit_code) {
-      // This really is a random number.  We haven't received any
-      // information about the exit code, presumably because this
-      // process doesn't have permission to get the exit code, or
-      // because of some other cause for GetExitCodeProcess to fail
-      // (MSDN docs don't give the possible failure error codes for
-      // this function, so it could be anything).  But we don't want
-      // to leave exit_code uninitialized, since that could cause
-      // random interpretations of the exit code.  So we assume it
-      // terminated "normally" in this case.
-      *exit_code = TERMINATION_STATUS_NORMAL_TERMINATION;
-    }
-    // Assume the child has exited normally if we can't get the exit
-    // code.
-    return TERMINATION_STATUS_NORMAL_TERMINATION;
+    // Assume the child has exited.
+    if (child_exited)
+      *child_exited = true;
+    return false;
   }
-  if (tmp_exit_code == STILL_ACTIVE) {
+  if (exitcode == STILL_ACTIVE) {
     DWORD wait_result = WaitForSingleObject(handle, 0);
     if (wait_result == WAIT_TIMEOUT) {
-      if (exit_code)
-        *exit_code = wait_result;
-      return TERMINATION_STATUS_STILL_RUNNING;
+      if (child_exited)
+        *child_exited = false;
+      return false;
     }
 
     DCHECK_EQ(WAIT_OBJECT_0, wait_result);
@@ -428,29 +417,27 @@ TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
     // Strange, the process used 0x103 (STILL_ACTIVE) as exit code.
     NOTREACHED();
 
-    return TERMINATION_STATUS_ABNORMAL_TERMINATION;
+    return false;
   }
 
-  if (exit_code)
-    *exit_code = tmp_exit_code;
+  // We're sure the child has exited.
+  if (child_exited)
+    *child_exited = true;
 
   // Warning, this is not generic code; it heavily depends on the way
   // the rest of the code kills a process.
 
-  switch (tmp_exit_code) {
-    case PROCESS_END_NORMAL_TERMINATION:
-      return TERMINATION_STATUS_NORMAL_TERMINATION;
-    case 0xC0000354:  // STATUS_DEBUGGER_INACTIVE.
-    case 0xC000013A:  // Control-C/end session.
-    case 0x40010004:  // Debugger terminated process/end session.
-    case PROCESS_END_PROCESS_WAS_KILLED:  // Task manager kill.
-      return TERMINATION_STATUS_PROCESS_WAS_KILLED;
-    case PROCESS_END_PROCESS_WAS_HUNG:
-      return TERMINATION_STATUS_PROCESS_WAS_HUNG;
-    default:
-      // All other exit codes indicate crashes.
-      return TERMINATION_STATUS_PROCESS_CRASHED;
+  if (exitcode == PROCESS_END_NORMAL_TERMINATION ||
+      exitcode == PROCESS_END_KILLED_BY_USER ||
+      exitcode == PROCESS_END_PROCESS_WAS_HUNG ||
+      exitcode == 0xC0000354 ||     // STATUS_DEBUGGER_INACTIVE.
+      exitcode == 0xC000013A ||     // Control-C/end session.
+      exitcode == 0x40010004) {     // Debugger terminated process/end session.
+    return false;
   }
+
+  // All other exit codes indicate crashes.
+  return true;
 }
 
 bool WaitForExitCode(ProcessHandle handle, int* exit_code) {