diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | gc.c | 9 |
2 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Sun Jun 19 14:09:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Fri Jun 17 13:01:40 2005 Tanaka Akira <akr@m17n.org> * lib/time.rb (Time.parse): fix previous leap seconds support. @@ -16,7 +24,7 @@ Thu Jun 16 13:34:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Thu Jun 16 12:53:24 2005 Tanaka Akira <akr@m17n.org> * lib/time.rb (Time.parse): "Fri Jan 1 08:59:60 +0900 1999" was - parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment + parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment which supports leap seconds. (Time.rfc2822): ditto. (Time.xmlschema): ditto. @@ -35,7 +43,7 @@ Wed Jun 15 18:26:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Tue Jun 14 02:02:43 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> - * ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) & + * ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) & _define_attribute_aliases(hash) to get substitution-argument from attributes (e.g. subst_arg(:x,:y,:num,:button) --> "%x %y %b %b "). @@ -1787,17 +1787,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); } @@ -1825,7 +1828,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) { |