cpython: 246e681a4272 (original) (raw)

Mercurial > cpython

changeset 75596:246e681a4272 3.2

Issue #14184: Increase the default stack size for secondary threads on Mac OS X to prevent interpreter crashes when compiled on 10.7. [#14184]

Ned Deily nad@acm.org
date	Tue, 13 Mar 2012 11🔞18 -0700
parents	397215db7be1
children	c00ac2b25048 7e79dbceb039 f0265b76fecd
files	Misc/NEWS Python/thread_pthread.h
diffstat	2 files changed, 15 insertions(+), 8 deletions(-)[+] [-] Misc/NEWS 3 Python/thread_pthread.h 20

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,6 +22,9 @@ Core and Builtins Library ------- +- Issue #14184: Increase the default stack size for secondary threads on

Mac OS X to avoid interpreter crashes when using threads on 10.7. +

Issue #10543: Fix unittest test discovery with Jython bytecode files.
Issue #14252: Fix subprocess.Popen.terminate() to not raise an error under

--- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -19,14 +19,18 @@ #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.
*/

+/* The default stack size for new threads on OSX and BSD is small enough that

- we'll get hard crashes instead of 'maximum recursion depth exceeded'
- exceptions.
*
- The default stack sizes below are the empirically determined minimal stack
- sizes where a simple recursive function doesn't cause a hard crash.
*/ +#if defined(APPLE) && defined(THREAD_STACK_SIZE) && THREAD_STACK_SIZE == 0 +#undef THREAD_STACK_SIZE +#define THREAD_STACK_SIZE 0x500000 +#endif +#if defined(FreeBSD) && defined(THREAD_STACK_SIZE) && THREAD_STACK_SIZE == 0

#undef THREAD_STACK_SIZE #define THREAD_STACK_SIZE 0x400000 #endif