summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-03 03:53:21 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-03 03:53:21 +0000
commit9d3ba342c90aeec8cec3011967b31bd1d03ae86b (patch)
treeb481386e2aa9f7560c7ccc4f8bacd963692046b4 /vm.c
parentadc978adc3932e5fdeb0bdc0622d2f52bf846dba (diff)
* gc.c (rb_objspace_free): With our "lazy-sweep" GC engine, it is
possible for an object to survive until its surrounding object space is about to be freed. Those objects, if any, remains not leaked for the rest of a process life. This is problematic because for instance a T_DATA object may have its own destructor to terminate something. * vm.c (ruby_vm_destruct): ruby_current_vm termination should be somewhere after rb_objspace_free for above reason. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm.c b/vm.c
index aca61c6906..015456bd93 100644
--- a/vm.c
+++ b/vm.c
@@ -1545,14 +1545,14 @@ ruby_vm_destruct(rb_vm_t *vm)
st_free_table(vm->living_threads);
vm->living_threads = 0;
}
- rb_vm_gvl_destroy(vm);
- ruby_xfree(vm);
- ruby_current_vm = 0;
#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
if (objspace) {
rb_objspace_free(objspace);
}
#endif
+ rb_vm_gvl_destroy(vm);
+ ruby_xfree(vm);
+ ruby_current_vm = 0;
}
RUBY_FREE_LEAVE("vm");
return 0;