diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-15 07:30:52 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-15 07:30:52 +0000 |
| commit | ea00025e45d0a9120dd9d6cad497cb825e7e1de1 (patch) | |
| tree | 16257a112f71d520e8c2791020b053960e8bb7d6 /thread_pthread.c | |
| parent | 9a018b046a3d2452c727902ce7af2ed57ba7e444 (diff) | |
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
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index b290677e3d..7631ef56a3 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -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 |