From 8d82657abbc02ef63a0723f5a45efe42322cb8a4 Mon Sep 17 00:00:00 2001 From: kosaki Date: Tue, 3 Jan 2012 00:09:21 +0000 Subject: merge revision(s) 33693: * 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/branches/ruby_1_9_3@34179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread_pthread.c | 14 +++++--------- version.h | 6 +++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd023994a6..e27edc1d87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 2 19:08:54 2012 KOSAKI Motohiro + + * thread_pthread.c (gvl_yield): don't prevent concurrent sched_yield(). + [Bug #5130] [ruby-core:38647] + Mon Jan 2 18:54:52 2012 NAKAMURA Usaku * win32/configure.bat: disable delayed expansion of enironment variable. diff --git a/thread_pthread.c b/thread_pthread.c index 7fa13e2a9c..255dbf02d2 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); diff --git a/version.h b/version.h index 998c003839..eeb98d2fab 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 7 +#define RUBY_PATCHLEVEL 8 -#define RUBY_RELEASE_DATE "2012-01-03" +#define RUBY_RELEASE_DATE "2012-01-02" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" -- cgit v1.2.3