ruby-changes:22928
From: nobu <ko1@a...>
Date: Mon, 12 Mar 2012 07:03:47 +0900 (JST)
Subject: [ruby-changes:22928] nobu:r34977 (trunk): * random.c (random_s_rand): ensure default PRNG is re-initialized
nobu 2012-03-12 07:03:36 +0900 (Mon, 12 Mar 2012) New Revision: 34977 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34977 Log: * random.c (random_s_rand): ensure default PRNG is re-initialized after fork. patched by Eric Wong. [ruby-core:41209][Bug #5661] Modified files: trunk/ChangeLog trunk/random.c trunk/test/ruby/test_rand.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 34976) +++ ChangeLog (revision 34977) @@ -1,3 +1,8 @@ +Mon Mar 12 07:03:32 2012 Nobuyoshi Nakada <nobu@r...> + + * random.c (random_s_rand): ensure default PRNG is re-initialized + after fork. patched by Eric Wong. [ruby-core:41209][Bug #5661] + Sun Mar 11 23:57:29 2012 NARUSE, Yui <naruse@r...> * pack.c (pack_unpack): when unpack('M') occurs an illegal byte Index: test/ruby/test_rand.rb =================================================================== --- test/ruby/test_rand.rb (revision 34976) +++ test/ruby/test_rand.rb (revision 34977) @@ -415,14 +415,43 @@ def test_fork_shuffle pid = fork do - (1..10).to_a.shuffle - raise 'default seed is not set' if srand == 0 + (1..10).to_a.shuffle + raise 'default seed is not set' if srand == 0 end p2, st = Process.waitpid2(pid) assert(st.success?, "#{st.inspect}") rescue NotImplementedError, ArgumentError end + def assert_fork_status(n, mesg, &block) + IO.pipe do |r, w| + (1..n).map do + p1 = fork {w.puts(block.call.to_s)} + _, st = Process.waitpid2(p1) + assert_send([st, :success?], mesg) + r.gets.strip + end + end + end + + def test_rand_reseed_on_fork + bug5661 = '[ruby-core:41209]' + + assert_fork_status(1, bug5661) {Random.rand(4)} + r1, r2 = *assert_fork_status(2, bug5661) {Random.rand} + assert_not_equal(r1, r2, bug5661) + + assert_fork_status(1, bug5661) {rand(4)} + r1, r2 = *assert_fork_status(2, bug5661) {rand} + assert_not_equal(r1, r2, bug5661) + + stable = Random.new + assert_fork_status(1, bug5661) {stable.rand(4)} + r1, r2 = *assert_fork_status(2, bug5661) {stable.rand} + assert_equal(r1, r2, bug5661) + rescue NotImplementedError + end + def test_seed bug3104 = '[ruby-core:29292]' rand_1 = Random.new(-1).rand Index: random.c =================================================================== --- random.c (revision 34976) +++ random.c (revision 34977) @@ -1293,6 +1293,7 @@ static VALUE random_s_rand(int argc, VALUE *argv, VALUE obj) { + rand_start(&default_rand); return random_rand(argc, argv, rb_Random_DEFAULT); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/