summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main_posix.cc
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-09 20:11:01 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-09 20:11:01 +0000
commit50795a03f1b48855143abfbf5a6a58e6e2759fb6 (patch)
treed4cfdf449faf2e8bea083de789e1c100f687c030 /chrome/browser/browser_main_posix.cc
parentd9f3793208dcf490b447869bfa5cb117c45abab9 (diff)
downloadchromium_src-50795a03f1b48855143abfbf5a6a58e6e2759fb6.zip
chromium_src-50795a03f1b48855143abfbf5a6a58e6e2759fb6.tar.gz
chromium_src-50795a03f1b48855143abfbf5a6a58e6e2759fb6.tar.bz2
Add shutdown trace functions
BUG=chromium-os:14737 TEST=None Review URL: http://codereview.chromium.org/6943001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_posix.cc')
-rw-r--r--chrome/browser/browser_main_posix.cc27
1 files changed, 26 insertions, 1 deletions
diff --git a/chrome/browser/browser_main_posix.cc b/chrome/browser/browser_main_posix.cc
index 9729f64..49fcaf2 100644
--- a/chrome/browser/browser_main_posix.cc
+++ b/chrome/browser/browser_main_posix.cc
@@ -5,8 +5,10 @@
#include "chrome/browser/browser_main_posix.h"
#include <errno.h>
+#include <limits.h>
#include <signal.h>
#include <sys/resource.h>
+#include <unistd.h>
#include <string>
@@ -14,7 +16,6 @@
#include "base/eintr_wrapper.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
-#include "base/threading/platform_thread.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/chrome_switches.h"
@@ -89,6 +90,27 @@ ShutdownDetector::ShutdownDetector(int shutdown_fd)
CHECK_NE(shutdown_fd_, -1);
}
+
+// These functions are used to help us diagnose crash dumps that happen
+// during the shutdown process.
+NOINLINE void ShutdownFDReadError() {
+ // Ensure function isn't optimized away.
+ asm("");
+ sleep(UINT_MAX);
+}
+
+NOINLINE void ShutdownFDClosedError() {
+ // Ensure function isn't optimized away.
+ asm("");
+ sleep(UINT_MAX);
+}
+
+NOINLINE void CloseAllBrowsersAndExitPosted() {
+ // Ensure function isn't optimized away.
+ asm("");
+ sleep(UINT_MAX);
+}
+
void ShutdownDetector::ThreadMain() {
base::PlatformThread::SetName("CrShutdownDetector");
@@ -102,9 +124,11 @@ void ShutdownDetector::ThreadMain() {
sizeof(signal) - bytes_read));
if (ret < 0) {
NOTREACHED() << "Unexpected error: " << strerror(errno);
+ ShutdownFDReadError();
break;
} else if (ret == 0) {
NOTREACHED() << "Unexpected closure of shutdown pipe.";
+ ShutdownFDClosedError();
break;
}
bytes_read += ret;
@@ -134,6 +158,7 @@ void ShutdownDetector::ThreadMain() {
RAW_LOG(WARNING, "Still here, exiting really ungracefully.");
_exit(signal | (1 << 7));
}
+ CloseAllBrowsersAndExitPosted();
}
// Sets the file descriptor soft limit to |max_descriptors| or the OS hard