summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-27 14:55:45 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-27 14:55:45 +0000
commitce5063c283da688ecb3d020ac218858751a0410f (patch)
treec4777348aa6bf330fdc77796c05aade58196d019 /gc.c
parent24a6416355e2d796aff643493cb273858e91b241 (diff)
* gc.c (gc_mark): still needs to check stack depth during GC.
* gc.c (stack_check): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/gc.c b/gc.c
index 8281875121..2f194ddf74 100644
--- a/gc.c
+++ b/gc.c
@@ -1047,12 +1047,9 @@ ruby_stack_length(VALUE **p)
return STACK_LENGTH;
}
-int
-ruby_stack_check(void)
+static int
+stack_check(void)
{
-#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
- return 0;
-#else
int ret;
rb_thread_t *th = GET_THREAD();
SET_STACK_END;
@@ -1064,6 +1061,15 @@ ruby_stack_check(void)
}
#endif
return ret;
+}
+
+int
+ruby_stack_check(void)
+{
+#if defined(POSIX_SIGNAL) && defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
+ return 0;
+#else
+ return stack_check();
#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 */
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_ptr - mark_stack < MARK_STACK_MAX) {
*mark_stack_ptr = ptr;