diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-30 06:12:37 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-30 06:12:37 +0000 |
| commit | d380745cc34db08ad12b66f11bc0e185df3c180b (patch) | |
| tree | a7e0f280ee0976abbb86db319fef04ef2f71166c | |
| parent | eac843396833c94807d66103d630f8ed05f70ce0 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gc.c | 10 | ||||
| -rw-r--r-- | test/ruby/test_gc.rb | 4 |
3 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Aug 30 15:12:22 2009 Nobuyoshi Nakada <[email protected]> + + * 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 <[email protected]> * ext/win32ole/win32ole.c (fole_s_show_help): fixed the comment @@ -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 |