diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-09 17:10:48 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-09 17:10:48 +0000 |
commit | 871c6923dc32630e93f3483d9db1e547ac62a478 (patch) | |
tree | 2aff25712738d1e43e8e01f47d87f4af0fa9f351 /thread_pthread.c | |
parent | c88d35619b79eda6f56fd912af4ddee762db10f5 (diff) | |
download | ruby-871c6923dc32630e93f3483d9db1e547ac62a478.tar.gz |
* thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield().
[Bug #5130] [ruby-core:38647]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
-rw-r--r-- | thread_pthread.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 7d03bcc561..7fa8e95ebd 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -109,16 +109,13 @@ gvl_yield(rb_vm_t *vm, rb_thread_t *th) goto acquire; } - vm->gvl.wait_yield = 1; - - if (vm->gvl.waiting > 0) - vm->gvl.need_yield = 1; - - if (vm->gvl.need_yield) { + if (vm->gvl.waiting > 0) { /* Wait until another thread task take GVL. */ - while (vm->gvl.need_yield) { + vm->gvl.need_yield = 1; + vm->gvl.wait_yield = 1; + while (vm->gvl.need_yield) native_cond_wait(&vm->gvl.switch_cond, &vm->gvl.lock); - } + vm->gvl.wait_yield = 0; } else { native_mutex_unlock(&vm->gvl.lock); @@ -126,7 +123,6 @@ gvl_yield(rb_vm_t *vm, rb_thread_t *th) native_mutex_lock(&vm->gvl.lock); } - vm->gvl.wait_yield = 0; native_cond_broadcast(&vm->gvl.switch_wait_cond); acquire: gvl_acquire_common(vm); |