From 72a77c994434ecb708b2790ba9efaf1decc02503 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size Signed-off-by: Khem Raj --- chromium/base/threading/platform_thread_linux.cc | 3 ++- chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc index 92fbda5ee1..c41579d4ed 100644 --- a/chromium/base/threading/platform_thread_linux.cc +++ b/chromium/base/threading/platform_thread_linux.cc @@ -175,7 +175,8 @@ void TerminateOnThread() {} size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { #if !defined(THREAD_SANITIZER) - return 0; + // use 8mb like glibc to avoid running out of space + return (1 << 23); #else // ThreadSanitizer bloats the stack heavily. Evidence has been that the // default stack size isn't enough for some browser tests. diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp index 1d164f510a..3358deb256 100644 --- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp +++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp @@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { // FIXME: On Mac OSX and Linux, this method cannot estimate stack size // correctly for the main thread. -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) // pthread_getattr_np() can fail if the thread is not invoked by // pthread_create() (e.g., the main thread of webkit_unit_tests). // If so, a conservative size estimate is returned. @@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() { } void* StackFrameDepth::getStackStart() { -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) pthread_attr_t attr; int error; #if OS(FREEBSD)