kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rb_fiber_terminate must not return [Bug #18497]

Browse source 
In a forked process from a fiber, the fiber becomes the only
fiber, `fiber_switch` does nothing as there is no other fibers,
`rb_fiber_terminate` does not terminate the fiber.  In that case,
reaches the end of `fiber_entry` finaly, which is declared as
"COROUTINE" and should never return.
This commit is contained in:
Nobuyoshi Nakada 2022-01-19 16:01:45 +09:00
parent 5c7af72304
commit d650b17686
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
Notes: git 2022-01-19 21:54:25 +09:00 
Merged: https://github.com/ruby/ruby/pull/5468
4 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cont.c
View file

@ -2039,7 +2039,7 @@ rb_fiber_set_scheduler(VALUE klass, VALUE scheduler)
return rb_fiber_scheduler_set(scheduler);
}
static void rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt, VALUE err);
NORETURN(static void rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt, VALUE err));
void
rb_fiber_start(rb_fiber_t *fiber)
@ -2408,6 +2408,7 @@ rb_fiber_terminate(rb_fiber_t *fiber, int need_interrupt, VALUE error)
fiber_switch(next_fiber, -1, &error, RB_NO_KEYWORDS, NULL, false);
else
fiber_switch(next_fiber, 1, &value, RB_NO_KEYWORDS, NULL, false);
ruby_stop(0);
}
static VALUE

2
eval_intern.h
View file

@ -287,7 +287,7 @@ VALUE rb_make_exception(int argc, const VALUE *argv);
NORETURN(void rb_method_name_error(VALUE, VALUE));
void rb_fiber_start(rb_fiber_t*);
NORETURN(void rb_fiber_start(rb_fiber_t*));
NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t));
NORETURN(void rb_print_undef_str(VALUE, VALUE));

15
test/fiber/test_process.rb
View file

@ -33,4 +33,19 @@ class TestFiberProcess < Test::Unit::TestCase
end
end.join
end
def test_fork
omit 'fork not supported' unless Process.respond_to?(:fork)
Thread.new do
scheduler = Scheduler.new
Fiber.set_scheduler scheduler
Fiber.schedule do
pid = Process.fork {}
Process.wait(pid)
assert_predicate $?, :success?
end
end.join
end
end

5
test/ruby/test_fiber.rb
View file

@ -407,6 +407,11 @@ class TestFiber < Test::Unit::TestCase
pid, status = Process.waitpid2(pid)
assert_not_predicate(status, :signaled?, bug5700)
assert_predicate(status, :success?, bug5700)
pid = Fiber.new {fork}.resume
pid, status = Process.waitpid2(pid)
assert_not_predicate(status, :signaled?)
assert_predicate(status, :success?)
end
def test_exit_in_fiber