1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
kosaki 2011-11-09 17:10:48 +00:00
parent c88d35619b
commit 871c6923dc
2 changed files with 10 additions and 9 deletions

View file

@ -1,3 +1,8 @@
Wed Nov 9 11:36:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield().
[Bug #5130] [ruby-core:38647]
Wed Nov 9 23:20:22 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_update_max_fd): fstat(2) can fail with other than

View file

@ -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);