summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main_posix.cc
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-05 07:11:12 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-05 07:11:12 +0000
commit5a4a7abc5253321b092cc7455100197a9914a34b (patch)
tree82977614248c1d26be509d2d0675df41ae20eb35 /chrome/browser/chrome_browser_main_posix.cc
parent7ac673b55f9c2334d531c280f907e2d0edaed68b (diff)
downloadchromium_src-5a4a7abc5253321b092cc7455100197a9914a34b.zip
chromium_src-5a4a7abc5253321b092cc7455100197a9914a34b.tar.gz
chromium_src-5a4a7abc5253321b092cc7455100197a9914a34b.tar.bz2
Increase kShutdownDetectorThreadStackSize under AddressSanitizer to avoid hitting the roof.
BUG=120623 Review URL: http://codereview.chromium.org/9965148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_posix.cc')
-rw-r--r--chrome/browser/chrome_browser_main_posix.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc
index 71285a1..20837a2 100644
--- a/chrome/browser/chrome_browser_main_posix.cc
+++ b/chrome/browser/chrome_browser_main_posix.cc
@@ -237,7 +237,13 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopStart() {
} else {
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
+#if !defined(ADDRESS_SANITIZER)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN;
+#else
+ // ASan instrumentation bloats the stack, so we need to increase the stack
+ // size to avoid hitting the guard page.
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+#endif
// TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
// if you change this, you'll probably need to change the suppression.
if (!base::PlatformThread::CreateNonJoinable(