mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 08:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #14184: merge

Browse source
This commit is contained in:
Ned Deily 2012-03-13 11:31:36 -07:00
commit 577c830531
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -24,6 +24,9 @@ Core and Builtins
Library 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 #14180: time.ctime(), gmtime(), time.localtime(), - Issue #14180: time.ctime(), gmtime(), time.localtime(),
datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and datetime.date.fromtimestamp(), datetime.datetime.fromtimestamp() and
datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of datetime.datetime.utcfromtimestamp() now raises an OverflowError, instead of

20
Python/thread_pthread.h
View file

@ -19,14 +19,18 @@
#define THREAD_STACK_SIZE 0 /* use default stack size */ #define THREAD_STACK_SIZE 0 /* use default stack size */
#endif #endif
#if (defined(__APPLE__) || defined(__FreeBSD__)) && defined(THREAD_STACK_SIZE) && THREAD_STACK_SIZE == 0 /* The default stack size for new threads on OSX and BSD is small enough that
/* The default stack size for new threads on OSX is small enough that * we'll get hard crashes instead of 'maximum recursion depth exceeded'
* we'll get hard crashes instead of 'maximum recursion depth exceeded' * exceptions.
* exceptions. *
* * The default stack sizes below are the empirically determined minimal stack
* The default stack size below is the minimal stack size where a * sizes where a simple recursive function doesn't cause a hard crash.
* 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 #undef THREAD_STACK_SIZE
#define THREAD_STACK_SIZE 0x400000 #define THREAD_STACK_SIZE 0x400000
#endif #endif