naruse	2016-03-29 15:15:22 +0900 (Tue, 29 Mar 2016)

  New Revision: 54371

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54371

  Log:
    merge revision(s) 54000: [Backport #12148]
    
    * thread_pthread.c (getstack): __pi_stacksize returned by
      pthread_getthrds_np() is wrong on AIX. Use
      __pi_stackend - __pi_stackaddr instead.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/thread_pthread.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54370)
+++ ruby_2_3/ChangeLog	(revision 54371)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Mar 29 15:10:31 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* thread_pthread.c (getstack): __pi_stacksize returned by
+	  pthread_getthrds_np() is wrong on AIX. Use
+	  __pi_stackend - __pi_stackaddr instead.
+
 Tue Mar 29 15:10:05 2016  Alex Boyd  <alex@o...>
 
 	* lib/irb.rb: avoid to needless truncation when using back_trace_limit option.
Index: ruby_2_3/thread_pthread.c
===================================================================
--- ruby_2_3/thread_pthread.c	(revision 54370)
+++ ruby_2_3/thread_pthread.c	(revision 54371)
@@ -619,7 +619,10 @@ get_stack(void **addr, size_t *size) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread_pthread.c#L619
 				   &thinfo, sizeof(thinfo),
 				   &reg, &regsiz));
     *addr = thinfo.__pi_stackaddr;
-    *size = thinfo.__pi_stacksize;
+    /* Must not use thinfo.__pi_stacksize for size.
+       It is around 3KB smaller than the correct size
+       calculated by thinfo.__pi_stackend - thinfo.__pi_stackaddr. */
+    *size = thinfo.__pi_stackend - thinfo.__pi_stackaddr;
     STACK_DIR_UPPER((void)0, (void)(*addr = (char *)*addr + *size));
 #elif defined __HAIKU__
     thread_info info;
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54370)
+++ ruby_2_3/version.h	(revision 54371)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 28
+#define RUBY_PATCHLEVEL 29
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54000


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/