Permalink
Browse files

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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 9a018b0 commit ea00025e45d0a9120dd9d6cad497cb825e7e1de1 @unak unak committed Jan 15, 2013
Showing with 8 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +1 −0 thread_pthread.c
  3. +1 −1 version.h
View
@@ -1,3 +1,9 @@
+Tue Jan 15 16:30:29 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * 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@gmail.com>
* gc.c (rb_objspace_call_finalizer): finalize_deferred may free up
View
@@ -140,6 +140,7 @@ gvl_init(rb_vm_t *vm)
vm->gvl.acquired = 0;
vm->gvl.waiting = 0;
vm->gvl.need_yield = 0;
+ vm->gvl.wait_yield = 0;
}
static void
View
@@ -1,5 +1,5 @@
#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

0 comments on commit ea00025

Please sign in to comment.