summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-09 14:42:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-09 14:42:15 +0000
commite8c6254680c2759df5d5e22818608fb84003d6c3 (patch)
tree77dc27dd1f2284ddba15666aaec0f4d20986dfbd
parent1b6e7a3de2c1c52701c620d5248360cdcb41ee29 (diff)
thread_pthread.c: workaround for valgrind on Mac
* thread.c: revert r59053. * thread_pthread.c (rb_thread_create_timer_thread): needs more stack space for valgrind. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--thread.c3
-rw-r--r--thread_pthread.c10
2 files changed, 9 insertions, 4 deletions
diff --git a/thread.c b/thread.c
index 4578cbe..74cdf4f 100644
--- a/thread.c
+++ b/thread.c
@@ -77,9 +77,6 @@
#define RUBY_THREAD_PRIORITY_MIN -3
#endif
-#if defined HAVE_VALGRIND_MEMCHECK_H && __APPLE__
-#define THREAD_DEBUG -1
-#endif
#ifndef THREAD_DEBUG
#define THREAD_DEBUG 0
#endif
diff --git a/thread_pthread.c b/thread_pthread.c
index 437ff37..f652429 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1602,9 +1602,17 @@ rb_thread_create_timer_thread(void)
* at least 16KB (4 pages). FreeBSD 8.2 AMD64 causes
* machine stack overflow only with PTHREAD_STACK_MIN.
*/
+ enum {
+ needs_more_stack =
+#if defined HAVE_VALGRIND_MEMCHECK_H && defined __APPLE__
+ 1
+#else
+ THREAD_DEBUG != 0
+#endif
+ };
size_t stack_size = PTHREAD_STACK_MIN; /* may be dynamic, get only once */
if (stack_size < min_size) stack_size = min_size;
- if (THREAD_DEBUG) stack_size += BUFSIZ;
+ if (needs_more_stack) stack_size += BUFSIZ;
pthread_attr_setstacksize(&attr, stack_size);
}
# endif