diff options
| author | Ned Deily <nad@acm.org> | 2011-04-09 12:37:55 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-04-09 12:37:55 -0700 |
| commit | 54f74064020b4aee126dd0a4fd04df2350831c68 (patch) | |
| tree | afcdf2f3d9b8e5d4cfc37d9455a31b0186cdea64 /Python/thread_pthread.h | |
| parent | b423fcbf66a153bb0008d55044669f6f1e211f6d (diff) | |
| parent | a848eb91738fc6affe9741b753a7cdea1fa8c0b5 (diff) | |
| download | cpython-54f74064020b4aee126dd0a4fd04df2350831c68.tar.gz | |
Issue #9670: merge with 3.2
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 ffc791c578..f120291819 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 */ |