usa	2012-10-16 10:55:31 +0900 (Tue, 16 Oct 2012)

  New Revision: 37208

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37208

  Log:
    merge revision(s) 34977: [Backport #5661]
    
    * random.c (random_s_rand): ensure default PRNG is re-initialized
      after fork.  patched by Eric Wong.  [ruby-core:41209][Bug #5661]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/random.c
    branches/ruby_1_9_3/test/ruby/test_rand.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37207)
+++ ruby_1_9_3/ChangeLog	(revision 37208)
@@ -1,3 +1,8 @@
+Tue Oct 16 10:47:43 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]
+
 Tue Oct 16 10:21:23 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (rb_f_sub, rb_f_gsub): pass the given block.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37207)
+++ ruby_1_9_3/version.h	(revision 37208)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 292
+#define RUBY_PATCHLEVEL 293
 
 #define RUBY_RELEASE_DATE "2012-10-16"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_rand.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_rand.rb	(revision 37207)
+++ ruby_1_9_3/test/ruby/test_rand.rb	(revision 37208)
@@ -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: ruby_1_9_3/random.c
===================================================================
--- ruby_1_9_3/random.c	(revision 37207)
+++ ruby_1_9_3/random.c	(revision 37208)
@@ -1255,6 +1255,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/