diff options
author | Ned Deily <nad@acm.org> | 2011-04-09 19:47:12 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2011-04-09 19:47:12 (GMT) |
commit | 6e678b439598b67266e6d5fcb56858a61335bff2 (patch) | |
tree | f0e404f58e61f3de350c035343671a12ec09b363 /Python/thread_pthread.h | |
parent | b2a290c329624a3c73203f0775882086f0853d8a (diff) | |
parent | 15012a67d25dbd1cee5e014be5f5f999c96c9c13 (diff) | |
download | cpython-6e678b439598b67266e6d5fcb56858a61335bff2.zip cpython-6e678b439598b67266e6d5fcb56858a61335bff2.tar.gz cpython-6e678b439598b67266e6d5fcb56858a61335bff2.tar.bz2 |
Issue #9670: merge with current
Diffstat (limited to 'Python/thread_pthread.h')
-rw-r--r-- | Python/thread_pthread.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 7d36b92..c70b655 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -18,6 +18,18 @@ #ifndef THREAD_STACK_SIZE #define THREAD_STACK_SIZE 0 /* use default stack size */ #endif + +#if (defined(__APPLE__) || defined(__FreeBSD__)) && defined(THREAD_STACK_SIZE) && THREAD_STACK_SIZE == 0 + /* The default stack size for new threads on OSX is small enough that + * we'll get hard crashes instead of 'maximum recursion depth exceeded' + * exceptions. + * + * The default stack size below is the minimal stack size where a + * simple recursive function doesn't cause a hard crash. + */ +#undef THREAD_STACK_SIZE +#define THREAD_STACK_SIZE 0x100000 +#endif /* for safety, ensure a viable minimum stacksize */ #define THREAD_STACK_MIN 0x8000 /* 32kB */ #else /* !_POSIX_THREAD_ATTR_STACKSIZE */ |