diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-15 14:00:11 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-15 14:00:11 +0000 |
commit | 2910f6736e09d1faa3b06db65e44193bdd2077c0 (patch) | |
tree | f521f2ed2842dff461c44c50acc9cbe607821391 | |
parent | ac43a903b061c8e04e25efa457ca21c7e49cc693 (diff) | |
download | ruby-2910f6736e09d1faa3b06db65e44193bdd2077c0.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 22 | ||||
-rw-r--r-- | cont.c | 24 | ||||
-rw-r--r-- | gc.c | 3 | ||||
-rw-r--r-- | internal.h | 4 | ||||
-rw-r--r-- | test/ruby/test_fiber.rb | 16 | ||||
-rw-r--r-- | vm.c | 1 |
6 files changed, 69 insertions, 1 deletions
@@ -1,3 +1,25 @@ +Wed Feb 15 22:20:19 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com> + + * 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. + Wed Feb 15 19:57:02 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/fiddle/closure.c (callback): deal with unsigned integers. @@ -330,6 +330,17 @@ fiber_memsize(const void *ptr) return size; } +VALUE +rb_obj_is_fiber(VALUE obj) +{ + if (rb_typeddata_is_kind_of(obj, &fiber_data_type)) { + return Qtrue; + } + else { + return Qfalse; + } +} + static void cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont) { @@ -1347,6 +1358,19 @@ rb_fiber_yield(int argc, VALUE *argv) return rb_fiber_transfer(return_fiber(), argc, argv); } +void +rb_fiber_reset_root_local_storage(VALUE thval) +{ + rb_thread_t *th; + rb_fiber_t *fib; + + GetThreadPtr(thval, th); + if (th->root_fiber && th->root_fiber != th->fiber) { + GetFiberPtr(th->root_fiber, fib); + th->local_storage = fib->cont.saved_thread.local_storage; + } +} + /* * call-seq: * fiber.alive? -> true or false @@ -3247,7 +3247,8 @@ rb_objspace_call_finalizer(rb_objspace_t *objspace) while (p < pend) { if (BUILTIN_TYPE(p) == T_DATA && DATA_PTR(p) && RANY(p)->as.data.dfree && - !rb_obj_is_thread((VALUE)p) && !rb_obj_is_mutex((VALUE)p) ) { + !rb_obj_is_thread((VALUE)p) && !rb_obj_is_mutex((VALUE)p) && + !rb_obj_is_fiber((VALUE)p)) { p->as.free.flags = 0; if (RTYPEDDATA_P(p)) { RDATA(p)->dfree = RANY(p)->as.typeddata.type->function.dfree; diff --git a/internal.h b/internal.h index 4c476ec9d0..94056bb043 100644 --- a/internal.h +++ b/internal.h @@ -62,6 +62,10 @@ int rb_parse_in_eval(void); int rb_parse_in_main(void); VALUE rb_insns_name_array(void); +/* cont.c */ +VALUE rb_obj_is_fiber(VALUE); +void rb_fiber_reset_root_local_storage(VALUE); + /* debug.c */ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index 7127a9cb12..9bac234252 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -248,5 +248,21 @@ class TestFiber < Test::Unit::TestCase f.transfer } end + + def test_fork_from_fiber + begin + Process.fork{} + rescue NotImplementedError + return + end + bug5700 = '[ruby-core:41456]' + pid = nil + assert_nothing_raised(bug5700) do + Fiber.new{ pid = fork {} }.resume + end + pid, status = Process.waitpid2(pid) + assert_equal(0, status.exitstatus, bug5700) + assert_equal(false, status.signaled?, bug5700) + end end @@ -1611,6 +1611,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) { |