summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-16 11:00:15 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-16 11:00:15 +0000
commit50c667a83779453b73f095970e8404d137246b58 (patch)
tree36f4f8264ab3a1bd89893a5d8da1b5c0bd254207 /gc.c
parent3eafecb77ec774d42594b64609940428de260679 (diff)
merge revision(s) 24713:
* 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_7@25801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/gc.c b/gc.c
index 52b1c23e6b..aec9b5e756 100644
--- a/gc.c
+++ b/gc.c
@@ -1223,7 +1223,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();