(original) (raw)

changeset: 75596:246e681a4272 branch: 3.2 parent: 75588:397215db7be1 user: Ned Deily nad@acm.org date: Tue Mar 13 11🔞18 2012 -0700 files: Misc/NEWS Python/thread_pthread.h description: Issue #14184: Increase the default stack size for secondary threads on Mac OS X to prevent interpreter crashes when compiled on 10.7. diff -r 397215db7be1 -r 246e681a4272 Misc/NEWS --- a/Misc/NEWS Tue Mar 13 12🔞19 2012 +0000 +++ b/Misc/NEWS Tue Mar 13 11🔞18 2012 -0700 @@ -22,6 +22,9 @@ 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 diff -r 397215db7be1 -r 246e681a4272 Python/thread_pthread.h --- a/Python/thread_pthread.h Tue Mar 13 12🔞19 2012 +0000 +++ b/Python/thread_pthread.h Tue Mar 13 11🔞18 2012 -0700 @@ -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 /nad@acm.org