From d8e5ec121a88393d695b20f7c5cc23e9b6e8cc74 Mon Sep 17 00:00:00 2001 From: ocean Date: Tue, 25 Oct 2005 04:44:51 +0000 Subject: [PATCH] * gc.c (garbage_collect): return now whether there're rooms for new objects, rather than whether GC run. fixed: [ruby-core:6376] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ gc.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cec26de800..5c45533f30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 25 13:40:16 2005 Hirokazu Yamamoto + + * gc.c (garbage_collect): return now whether there're rooms for new + objects, rather than whether GC run. fixed: [ruby-core:6376] + Tue Oct 25 02:12:08 2005 Nobuyoshi Nakada * lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE): diff --git a/gc.c b/gc.c index b803e8c0fb..7b6cbdc558 100644 --- a/gc.c +++ b/gc.c @@ -1280,10 +1280,10 @@ garbage_collect(void) if (dont_gc || during_gc) { if (!freelist) { add_heap(); + return Qtrue; } return Qfalse; } - if (during_gc) return Qfalse; during_gc++; init_mark_stack();