diff options
| author | Ned Deily <nad@acm.org> | 2011-04-09 19:37:55 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-04-09 19:37:55 (GMT) |
| commit | 15012a67d25dbd1cee5e014be5f5f999c96c9c13 (patch) | |
| tree | ee4d562503929d3d015ca5039509b21ad1c88247 /Python | |
| parent | 226580e6dc46eab9c33b64a5635645686e5df57f (diff) | |
| parent | 517ac72b00f34ce6fc00ea79997d5bf9464401b1 (diff) | |
| download | cpython-15012a67d25dbd1cee5e014be5f5f999c96c9c13.zip cpython-15012a67d25dbd1cee5e014be5f5f999c96c9c13.tar.gz cpython-15012a67d25dbd1cee5e014be5f5f999c96c9c13.tar.bz2 | |
Issue #9670: merge with 3.2
Diffstat (limited to 'Python')
| -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 ffc791c..f120291 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 */ |