kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (gc_mark): still needs to check stack depth during GC.

Browse source 
* gc.c (stack_check): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-11-27 14:55:45 +00:00
parent 24a6416355
commit ce5063c283
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Nov 27 23:54:37 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (gc_mark): still needs to check stack depth during GC.
* gc.c (stack_check): ditto.
Thu Nov 27 21:41:29 2008 Tadayoshi Funaba <tadf@dotrb.org> Thu Nov 27 21:41:29 2008 Tadayoshi Funaba <tadf@dotrb.org>
* strftime.c (rb_strftime): should add padding for %%. * strftime.c (rb_strftime): should add padding for %%.

18
gc.c
View file

@ -1047,12 +1047,9 @@ ruby_stack_length(VALUE **p)
return STACK_LENGTH; return STACK_LENGTH;
} }
int static int
ruby_stack_check(void) stack_check(void)
{ {
#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
return 0;
#else
int ret; int ret;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
SET_STACK_END; SET_STACK_END;
@ -1064,6 +1061,15 @@ ruby_stack_check(void)
} }
#endif #endif
return ret; return ret;
}
int
ruby_stack_check(void)
{
#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
return 0;
#else
return stack_check();
#endif #endif
} }
@ -1273,7 +1279,7 @@ gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
if (obj->as.basic.flags & FL_MARK) return; /* already marked */ if (obj->as.basic.flags & FL_MARK) return; /* already marked */
obj->as.basic.flags |= FL_MARK; obj->as.basic.flags |= FL_MARK;
if (lev > GC_LEVEL_MAX || (lev == 0 && ruby_stack_check())) { if (lev > GC_LEVEL_MAX || (lev == 0 && stack_check())) {
if (!mark_stack_overflow) { if (!mark_stack_overflow) {
if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) { if (mark_stack_ptr - mark_stack < MARK_STACK_MAX) {
*mark_stack_ptr = ptr; *mark_stack_ptr = ptr;