Skip to content

Commit

Permalink
* thread_pthread.c (ruby_init_stack): ignore `STACK_END_ADDRESS'
Browse files Browse the repository at this point in the history
  if Ruby interpreter is running on co-routine.
  [Feature ruby#2294]
  https://bugs.ruby-lang.org/issues/2294#note-18



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
ko1 committed Jan 23, 2013
1 parent fa30ebc commit e5481cc
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Wed Jan 23 13:35:37 2013 Koichi Sasada <[email protected]>

* thread_pthread.c (ruby_init_stack): ignore `STACK_END_ADDRESS'
if Ruby interpreter is running on co-routine.
[Feature #2294]
https://bugs.ruby-lang.org/issues/2294#note-18

Wed Jan 23 12:28:22 2013 Nobuyoshi Nakada <[email protected]>

* win32/win32.c (rb_w32_spawn, rb_w32_aspawn_flags): check the results
Expand Down
21 changes: 21 additions & 0 deletions thread_pthread.c
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,27 @@ ruby_init_stack(volatile VALUE *addr
native_main_thread.stack_maxsize = space;
#endif
}

/* If addr is out of range of main-thread stack range estimation, */
/* it should be on co-routine (alternative stack). [Feature #2294] */
{
void *start, *end;

if (IS_STACK_DIR_UPPER()) {
start = native_main_thread.stack_start;
end = (char *)native_main_thread.stack_start + native_main_thread.stack_maxsize;
}
else {
start = (char *)native_main_thread.stack_start - native_main_thread.stack_maxsize;
end = native_main_thread.stack_start;
}

if ((void *)addr < start || (void *)addr > end) {
/* out of range */
native_main_thread.stack_start = (VALUE *)addr;
native_main_thread.stack_maxsize = 0; /* unknown */
}
}
}

#define CHECK_ERR(expr) \
Expand Down

0 comments on commit e5481cc

Please sign in to comment.