From 8cdf5c417993f453149365f76c46f28e0bb4fa8f Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 15 Feb 2012 22:34:48 +0000 Subject: merge revision(s) 34629,34630: * cont.c (rb_fiber_reset_root_local_storage): add a new function to restore rb_thread_t::local_storage. * cont.c (rb_obj_is_fiber): add a new function to tell finalizer to prevent fibers from destroy. * gc.c (rb_objspace_call_finalizer): don't sweep fibers at finalizing objspace. * internal.h (rb_fiber_reset_root_local_storage, rb_obj_is_fiber): add prototypes. * vm.c (ruby_vm_destruct): reset main thread's local_storage before free main thread. rb_thread_t::local_storage is replaced by fiber's local storage when forked from fiber, and it should be already freed when the fiber was destroyed. * test/ruby/test_fiber.rb (test_fork_from_fiber): add test for fork from fiber. when the fiber was destroyed. [ruby-core:41456] [Bug #5700] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 1 + 1 file changed, 1 insertion(+) (limited to 'vm.c') diff --git a/vm.c b/vm.c index 2d7e15c0fa..e997afa0c7 100644 --- a/vm.c +++ b/vm.c @@ -1609,6 +1609,7 @@ ruby_vm_destruct(rb_vm_t *vm) rb_gc_force_recycle(vm->self); vm->main_thread = 0; if (th) { + rb_fiber_reset_root_local_storage(th->self); thread_free(th); } if (vm->living_threads) { -- cgit v1.2.3