diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-01 02:17:14 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-01 02:17:14 +0000 |
commit | 1cc19523c25029d66df15086de65b01a7dbe98f7 (patch) | |
tree | b7b43c23fde451301a741a05a5d4d20995f867ca | |
parent | 05b05a8f56fbf9d1558c108d8eee3a09e4a78823 (diff) |
Revert r66968
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@66975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | cont.c | 14 | ||||
-rw-r--r-- | test/ruby/test_fiber.rb | 6 | ||||
-rw-r--r-- | thread.c | 2 | ||||
-rw-r--r-- | version.h | 8 |
4 files changed, 5 insertions, 25 deletions
@@ -1660,20 +1660,6 @@ rb_fiber_s_current(VALUE klass) -#ifdef HAVE_WORKING_FORK -void -rb_fiber_atfork(rb_thread_t *th) -{ - if (th->root_fiber) { - if (&th->root_fiber->cont.saved_ec != th->ec) { - th->root_fiber = th->ec->fiber_ptr; - th->root_fiber->cont.type = ROOT_FIBER_CONTEXT; - } - th->root_fiber->prev = 0; - } -} -#endif - /* * Document-class: FiberError * diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index dec9f8028b..ffcb02ce51 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -256,11 +256,7 @@ class TestFiber < Test::Unit::TestCase end bug5700 = '[ruby-core:41456]' assert_nothing_raised(bug5700) do - Fiber.new do - pid = fork do - Fiber.new {}.transfer - end - end.resume + Fiber.new{ pid = fork {} }.resume end pid, status = Process.waitpid2(pid) assert_equal(0, status.exitstatus, bug5700) @@ -4172,14 +4172,12 @@ terminate_atfork_i(rb_thread_t *th, const rb_thread_t *current_th) } } -void rb_fiber_atfork(rb_thread_t *); void rb_thread_atfork(void) { rb_thread_t *th = GET_THREAD(); rb_thread_atfork_internal(th, terminate_atfork_i); th->join_list = NULL; - rb_fiber_atfork(th); /* We don't want reproduce CVE-2003-0900. */ rb_reset_random_seed(); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.6" -#define RUBY_RELEASE_DATE "2019-01-31" -#define RUBY_PATCHLEVEL 346 +#define RUBY_RELEASE_DATE "2019-02-01" +#define RUBY_PATCHLEVEL 347 #define RUBY_RELEASE_YEAR 2019 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 1 #include "ruby/version.h" |