summaryrefslogtreecommitdiff
path: root/Python/thread_pthread.h
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2011-06-04 23:05:19 -0700
committerGregory P. Smith <greg@krypto.org>2011-06-04 23:05:19 -0700
commitd64b2bae9b4d1b761cd16f75e3fe3e9c19533b3e (patch)
treecac5baf3e31b67e39cb9b69d982958cc9419db06 /Python/thread_pthread.h
parentb6471db8a76416b2eb49fe9b02c6f9f9a6502b4d (diff)
parente13e662244b4915e933eb2c84bc50705f99f5c4a (diff)
downloadcpython-git-d64b2bae9b4d1b761cd16f75e3fe3e9c19533b3e.tar.gz
merge heads.
Diffstat (limited to 'Python/thread_pthread.h')
-rw-r--r--Python/thread_pthread.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
index 40ebaf6964..09a0887bd4 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 0x400000
+#endif
/* for safety, ensure a viable minimum stacksize */
#define THREAD_STACK_MIN 0x8000 /* 32kB */
#else /* !_POSIX_THREAD_ATTR_STACKSIZE */