diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-19 05:09:32 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-06-19 05:09:32 +0000 |
commit | c8b7f0cef9e4e78e7c5cddd9b69e2bcd3eac4876 (patch) | |
tree | 536f30aa50eb45447a97257761ea7b9eaf2cc216 /gc.c | |
parent | 3adc6a6d3dea7a312881da9431e774079350c9af (diff) | |
download | ruby-c8b7f0cef9e4e78e7c5cddd9b69e2bcd3eac4876.tar.gz |
* gc.c (run_final): reduce unnecessary object allocation during
finalization.
* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
be cleared before calling them. fixed: [ruby-talk:145790]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -1773,17 +1773,20 @@ run_final(obj) int status, critical_save = rb_thread_critical; VALUE args[3], table; + objid = rb_obj_id(obj); /* make obj into id */ rb_thread_critical = Qtrue; - args[1] = rb_ary_new3(1, rb_obj_id(obj)); /* make obj into id */ + args[1] = 0; args[2] = (VALUE)ruby_safe_level; for (i=0; i<RARRAY(finalizers)->len; i++) { args[0] = RARRAY(finalizers)->ptr[i]; + if (!args[1]) args[1] = rb_ary_new3(1, objid); rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status); } if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) { for (i=0; i<RARRAY(table)->len; i++) { VALUE final = RARRAY(table)->ptr[i]; args[0] = RARRAY(final)->ptr[1]; + if (!args[1]) args[1] = rb_ary_new3(1, objid); args[2] = FIX2INT(RARRAY(final)->ptr[0]); rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status); } @@ -1811,7 +1814,9 @@ rb_gc_call_finalizer_at_exit() /* run finalizers */ if (need_call_final) { - finalize_list(deferred_final_list); + p = deferred_final_list; + deferred_final_list = 0; + finalize_list(p); for (i = 0; i < heaps_used; i++) { p = heaps[i].slot; pend = p + heaps[i].limit; while (p < pend) { |