diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | thread_pthread.c | 5 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Mar 25 17:28:13 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * thread_pthread.c (getstack): __pi_stacksize returned by + pthread_getthrds_np() is wrong on AIX. Use + __pi_stackend - __pi_stackaddr instead. + Fri Mar 25 17:21:51 2016 Alex Boyd <alex@opengroove.org> * lib/irb.rb: avoid to needless truncation when using back_trace_limit option. diff --git a/thread_pthread.c b/thread_pthread.c index 968c644897..47e94156e1 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -608,7 +608,10 @@ get_stack(void **addr, size_t *size) &thinfo, sizeof(thinfo), ®, ®siz)); *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)); #else #error STACKADDR_AVAILABLE is defined but not implemented. @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-03-25" -#define RUBY_PATCHLEVEL 461 +#define RUBY_PATCHLEVEL 462 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |