From 31a060f7bd55a845824883b87700ca5bb39f7ab0 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 13 Apr 2008 09:52:29 +0000 Subject: * thread_pthread.c (lock_func): should not check interrupts in blocking region. [ruby-dev:34378] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'thread.c') diff --git a/thread.c b/thread.c index 57b2085735..d2c9adc306 100644 --- a/thread.c +++ b/thread.c @@ -2317,23 +2317,23 @@ rb_mutex_trylock(VALUE self) return locked; } -static VALUE +static int lock_func(rb_thread_t *th, mutex_t *mutex) { + int interrupted = Qfalse; + native_mutex_lock(&mutex->lock); - while (mutex->th) { + while (mutex->th || (mutex->th = th, 0)) { mutex->cond_waiting++; native_cond_wait(&mutex->cond, &mutex->lock); if (th->interrupt_flag) { - native_mutex_unlock(&mutex->lock); - RUBY_VM_CHECK_INTS(); - native_mutex_lock(&mutex->lock); + interrupted = Qtrue; + break; } } - mutex->th = th; native_mutex_unlock(&mutex->lock); - return Qnil; + return interrupted; } static void @@ -2364,11 +2364,15 @@ rb_mutex_lock(VALUE self) GetMutexPtr(self, mutex); while (mutex->th != th) { + int interrupted; + BLOCKING_REGION({ - lock_func(th, mutex); + interrupted = lock_func(th, mutex); }, lock_interrupt, mutex); - RUBY_VM_CHECK_INTS(); + if (interrupted) { + RUBY_VM_CHECK_INTS(); + } } } return self; -- cgit v1.2.3