From d380745cc34db08ad12b66f11bc0e185df3c180b Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 30 Aug 2009 06:12:37 +0000 Subject: * gc.c (gc_sweep): makes new room if object space is full of finalized objects and has no free objects. [ruby-dev:39201] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@24713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ gc.c | 10 +++++++++- test/ruby/test_gc.rb | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3d6dbdf720..84392cda02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Aug 30 15:12:22 2009 Nobuyoshi Nakada + + * gc.c (gc_sweep): makes new room if object space is full of + finalized objects and has no free objects. [ruby-dev:39201] + Sat Aug 29 07:03:26 2009 Masaki Suketa * ext/win32ole/win32ole.c (fole_s_show_help): fixed the comment diff --git a/gc.c b/gc.c index 742415b16d..748f26072e 100644 --- a/gc.c +++ b/gc.c @@ -1246,7 +1246,15 @@ gc_sweep() /* clear finalization list */ if (final_list) { deferred_final_list = final_list; - rb_thread_pending = 1; + if (!freelist && !rb_thread_critical) { + rb_gc_finalize_deferred(); + } + else { + rb_thread_pending = 1; + } + if (!freelist) { + add_heap(); + } return; } free_unused_heaps(); diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index d0b4e3df77..ed854bde65 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -26,5 +26,9 @@ class TestGc < Test::Unit::TestCase } GC.start assert true # reach here or dumps core + 100000.times { + Time.now + } + assert true, '[ruby-dev:39201]' # reach here or dumps core end end -- cgit v1.2.3