summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-25 04:44:51 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-25 04:44:51 +0000
commitf259643d87419b41ba6a71aad8c5878c3d2e354b (patch)
treecef9dd3a7f65c65c1fdb8866a08ebc2f35c1003c
parentf3dd68f0744004fcb65045aad2687ba70ea991cb (diff)
downloadruby-f259643d87419b41ba6a71aad8c5878c3d2e354b.tar.gz
ruby-f259643d87419b41ba6a71aad8c5878c3d2e354b.tar.xz
ruby-f259643d87419b41ba6a71aad8c5878c3d2e354b.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@9462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--gc.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cec26de80..5c45533f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 25 13:40:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * 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 <nobu@ruby-lang.org>
* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
diff --git a/gc.c b/gc.c
index b803e8c0f..7b6cbdc55 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();