1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thread_pthread.c: use get_main_stack properly

Browse Source 
* thread_pthread.c (ruby_init_stack): set stack_start properly by
  get_main_stack() if possible.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-11-18 13:47:12 +00:00
parent ecbdd8fcad
commit 53953eee7c
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Nov 18 22:47:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread_pthread.c (ruby_init_stack): set stack_start properly by
get_main_stack() if possible.
Mon Nov 18 22:45:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Nov 18 22:45:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval_jump.c (rb_exec_end_proc): unlink and free procs data before * eval_jump.c (rb_exec_end_proc): unlink and free procs data before

25
thread_pthread.c
View File

@ -485,7 +485,7 @@ static rb_thread_t *register_cached_thread_and_wait(void);
#elif defined HAVE_PTHREAD_GET_STACKADDR_NP && defined HAVE_PTHREAD_GET_STACKSIZE_NP #elif defined HAVE_PTHREAD_GET_STACKADDR_NP && defined HAVE_PTHREAD_GET_STACKSIZE_NP
#define STACKADDR_AVAILABLE 1 #define STACKADDR_AVAILABLE 1
#undef MAINSTACKADDR_AVAILABLE #undef MAINSTACKADDR_AVAILABLE
#define MAINSTACKADDR_AVAILABLE 0 #define MAINSTACKADDR_AVAILABLE 1
void *pthread_get_stackaddr_np(pthread_t); void *pthread_get_stackaddr_np(pthread_t);
size_t pthread_get_stacksize_np(pthread_t); size_t pthread_get_stacksize_np(pthread_t);
#elif defined HAVE_THR_STKSEGMENT || defined HAVE_PTHREAD_STACKSEG_NP #elif defined HAVE_THR_STKSEGMENT || defined HAVE_PTHREAD_STACKSEG_NP
@ -677,7 +677,20 @@ ruby_init_stack(volatile VALUE *addr
native_main_thread.register_stack_start = (VALUE*)bsp; native_main_thread.register_stack_start = (VALUE*)bsp;
} }
#endif #endif
#if MAINSTACKADDR_AVAILABLE
if (native_main_thread.stack_maxsize) return;
{ {
void* stackaddr;
size_t size;
if (get_main_stack(&stackaddr, &size) == 0) {
native_main_thread.stack_maxsize = size;
native_main_thread.stack_start = stackaddr;
return;
}
}
#endif
{
#if defined(HAVE_GETRLIMIT)
#if defined(PTHREAD_STACK_DEFAULT) #if defined(PTHREAD_STACK_DEFAULT)
# if PTHREAD_STACK_DEFAULT < RUBY_STACK_SPACE*5 # if PTHREAD_STACK_DEFAULT < RUBY_STACK_SPACE*5
# error "PTHREAD_STACK_DEFAULT is too small" # error "PTHREAD_STACK_DEFAULT is too small"
@ -686,15 +699,7 @@ ruby_init_stack(volatile VALUE *addr
#else #else
size_t size = RUBY_VM_THREAD_VM_STACK_SIZE; size_t size = RUBY_VM_THREAD_VM_STACK_SIZE;
#endif #endif
size_t space = space_size(size); size_t space;
#if MAINSTACKADDR_AVAILABLE
void* stackaddr;
STACK_GROW_DIR_DETECTION;
if (get_main_stack(&stackaddr, &size) == 0) {
space = STACK_DIR_UPPER((char *)addr - (char *)stackaddr, (char *)stackaddr - (char *)addr);
}
native_main_thread.stack_maxsize = size - space;
#elif defined(HAVE_GETRLIMIT)
int pagesize = getpagesize(); int pagesize = getpagesize();
struct rlimit rlim; struct rlimit rlim;
STACK_GROW_DIR_DETECTION; STACK_GROW_DIR_DETECTION;