diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-27 10:25:23 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-27 10:25:23 +0000 |
| commit | f46c2605219e33e93c031bfe5d7aa2e2458cd488 (patch) | |
| tree | e6d31c6943b94dde015ca2acd5d76efd34d8ca46 /gc.c | |
| parent | 78630e3a82afdea79220364d78aa4aea52ca100d (diff) | |
merge revision(s) 22882,22961,22971:
* gc.c (run_final): calls free function. [ruby-core:22578]
* gc.c (rb_gc_call_finalizer_at_exit): leave Thread objects
unfinalized. [ruby-dev:38168]
* gc.c (run_final): frees zombies only. [ruby-dev:38171]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
| -rw-r--r-- | gc.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1942,6 +1942,9 @@ run_final(obj) objid = rb_obj_id(obj); /* make obj into id */ rb_thread_critical = Qtrue; + if (BUILTIN_TYPE(obj) == T_DEFERRED && RDATA(obj)->dfree) { + (*RDATA(obj)->dfree)(DATA_PTR(obj)); + } args[1] = 0; args[2] = (VALUE)ruby_safe_level; for (i=0; i<RARRAY(finalizers)->len; i++) { @@ -2010,7 +2013,8 @@ rb_gc_call_finalizer_at_exit() p = heaps[i].slot; pend = p + heaps[i].limit; while (p < pend) { if (BUILTIN_TYPE(p) == T_DATA && - DATA_PTR(p) && RANY(p)->as.data.dfree) { + DATA_PTR(p) && RANY(p)->as.data.dfree && + RANY(p)->as.basic.klass != rb_cThread) { p->as.free.flags = 0; if ((long)RANY(p)->as.data.dfree == -1) { RUBY_CRITICAL(free(DATA_PTR(p))); |