usa	2013-01-15 16:30:52 +0900 (Tue, 15 Jan 2013)

  New Revision: 38832

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

  Log:
    merge revision(s) 38819: [Backport #7693]
    
    * thread_pthread.c (gvl_init): Reset gvl.wait_yield explicitly when
      fork()ing. Patch by Apollon Oikonomopoulos. Thanks!
      [Bug #7693][ruby-core:51424]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/thread_pthread.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38831)
+++ ruby_1_9_3/ChangeLog	(revision 38832)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Tue Jan 15 16:30:29 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* thread_pthread.c (gvl_init): Reset gvl.wait_yield explicitly when
+	  fork()ing. Patch by Apollon Oikonomopoulos. Thanks!
+	  [Bug #7693][ruby-core:51424]
+
 Tue Jan 15 16:25:35 2013  Narihiro Nakamura  <authornari@g...>
 
 	* gc.c (rb_objspace_call_finalizer): finalize_deferred may free up
Index: ruby_1_9_3/thread_pthread.c
===================================================================
--- ruby_1_9_3/thread_pthread.c	(revision 38831)
+++ ruby_1_9_3/thread_pthread.c	(revision 38832)
@@ -140,6 +140,7 @@ gvl_init(rb_vm_t *vm) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/thread_pthread.c#L140
     vm->gvl.acquired = 0;
     vm->gvl.waiting = 0;
     vm->gvl.need_yield = 0;
+    vm->gvl.wait_yield = 0;
 }
 
 static void
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38831)
+++ ruby_1_9_3/version.h	(revision 38832)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 372
+#define RUBY_PATCHLEVEL 373
 
 #define RUBY_RELEASE_DATE "2013-01-15"
 #define RUBY_RELEASE_YEAR 2013

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r38819


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/