diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-21 11:14:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-21 11:14:54 +0000 |
| commit | 6802a3f6f2700b8690d91a9025ac8c4da9ac217d (patch) | |
| tree | d10b2acea83aa3c01c700b21a15c899846543aca /thread_pthread.c | |
| parent | 63da4ce3bc9eba0290f9ad8b964f6a06779c3273 (diff) | |
| download | ruby-6802a3f6f2700b8690d91a9025ac8c4da9ac217d.tar.gz | |
thread_pthread.c: fix for dynamic PTHREAD_STACK_MIN
* thread_pthread.c (rb_thread_create_timer_thread): fix for platforms
where PTHREAD_STACK_MIN is a dynamic value and not a compile-time
constant. [ruby-dev:47911] [Bug #9436]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 7f2aae4482..cf0e3705af 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1480,17 +1480,15 @@ rb_thread_create_timer_thread(void) } # ifdef PTHREAD_STACK_MIN { -# define TIMER_THREAD_STACK_MIN_SIZE (4096 * 4) + const size_t min_size = (4096 * 4); /* Allocate the machine stack for the timer thread * at least 16KB (4 pages). FreeBSD 8.2 AMD64 causes * machine stack overflow only with PTHREAD_STACK_MIN. */ -# if TIMER_THREAD_STACK_MIN_SIZE < PTHREAD_STACK_MIN -# undef TIMER_THREAD_STACK_MIN_SIZE -# define TIMER_THREAD_STACK_MIN_SIZE PTHREAD_STACK_MIN -# endif - pthread_attr_setstacksize(&attr, - TIMER_THREAD_STACK_MIN_SIZE + (THREAD_DEBUG ? BUFSIZ : 0)); + 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; + pthread_attr_setstacksize(&attr, stack_size); } # endif #endif |