merge revision(s) 44670,44671,44673,44675: [Backport ruby#8783]

	thread_pthread.c: timer thread stack size

	* thread_pthread.c (rb_thread_create_timer_thread): define the stack
  size for timer thread at compile time.
	* thread_pthread.c (rb_thread_create_timer_thread): expand timer
	  thread stack size to get rid of segfault on FreeBSD/powerpc64.
	  based on the patch by Steve Wills at [ruby-core:59923].
	  [ruby-core:56590] [Bug ruby#8783]

	* 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 ruby#9436]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: nurse

ChangeLog

@@ -1,3 +1,16 @@
+Sat Feb 22 15:56:53 2014  Nobuyoshi Nakada  <[email protected]>
+
+	* 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]
+
+Sat Feb 22 15:56:53 2014  Nobuyoshi Nakada  <[email protected]>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): expand timer
+	  thread stack size to get rid of segfault on FreeBSD/powerpc64.
+	  based on the patch by Steve Wills at [ruby-core:59923].
+	  [ruby-core:56590] [Bug #8783]
+
 Sat Feb 22 15:13:38 2014  Benoit Daloze  <[email protected]>
 
 	* range.c (Range#size): [DOC] improve description and add examples.

thread_pthread.c

@@ -1479,17 +1479,16 @@ rb_thread_create_timer_thread(void)
 	    exit(EXIT_FAILURE);
         }
 # ifdef PTHREAD_STACK_MIN
-	if (PTHREAD_STACK_MIN < 4096 * 3) {
+	{
+	    const size_t min_size = (4096 * 4);
 	    /* Allocate the machine stack for the timer thread
-             * at least 12KB (3 pages).  FreeBSD 8.2 AMD64 causes
-             * machine stack overflow only with PTHREAD_STACK_MIN.
+	     * at least 16KB (4 pages).  FreeBSD 8.2 AMD64 causes
+	     * machine stack overflow only with PTHREAD_STACK_MIN.
 	     */
-	    pthread_attr_setstacksize(&attr,
-				      4096 * 3 + (THREAD_DEBUG ? BUFSIZ : 0));
-	}
-	else {
-	    pthread_attr_setstacksize(&attr,
-				      PTHREAD_STACK_MIN + (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

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 63
+#define RUBY_PATCHLEVEL 64
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2