diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index ef2f01d3690443..0ad69163aa8474 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -14,6 +14,7 @@ #include "libplatform/libplatform.h" +#include #include #include #include @@ -101,12 +102,18 @@ static int StartDebugSignalHandler() { CHECK_EQ(0, uv_sem_init(&start_io_thread_semaphore, 0)); pthread_attr_t attr; CHECK_EQ(0, pthread_attr_init(&attr)); - // Don't shrink the thread's stack on FreeBSD. Said platform decided to - // follow the pthreads specification to the letter rather than in spirit: - // https://lists.freebsd.org/pipermail/freebsd-current/2014-March/048885.html -#ifndef __FreeBSD__ - CHECK_EQ(0, pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN)); -#endif // __FreeBSD__ +#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__) + // PTHREAD_STACK_MIN is 2 KB with musl libc, which is too small to safely + // receive signals. PTHREAD_STACK_MIN + MINSIGSTKSZ is 8 KB on arm64, which + // is the musl architecture with the biggest MINSIGSTKSZ so let's use that + // as a lower bound and let's quadruple it just in case. The goal is to avoid + // creating a big 2 or 4 MB address space gap (problematic on 32 bits + // because of fragmentation), not squeeze out every last byte. + // Omitted on FreeBSD because it doesn't seem to like small stacks. + const size_t stack_size = std::max(static_cast(4 * 8192), + static_cast(PTHREAD_STACK_MIN)); + CHECK_EQ(0, pthread_attr_setstacksize(&attr, stack_size)); +#endif // defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__) CHECK_EQ(0, pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)); sigset_t sigmask; // Mask all signals.