diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | thread.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat May 7 15:18:06 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + fix incorrect native_cond_signal call when deadlock was detected. + + * thread.c (lock_func): timedwait don't touch cond_waiting and + cond_notifid variables. + Sat May 7 15:15:10 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> fix win32 native_cond_timedwait() makes SIGSEGV. @@ -3423,7 +3423,6 @@ lock_func(rb_thread_t *th, mutex_t *mutex, int timeout_ms) break; } - mutex->cond_waiting++; if (timeout_ms) { int ret; struct timespec timeout_rel; @@ -3439,9 +3438,10 @@ lock_func(rb_thread_t *th, mutex_t *mutex, int timeout_ms) } } else { + mutex->cond_waiting++; native_cond_wait(&mutex->cond, &mutex->lock); + mutex->cond_notified--; } - mutex->cond_notified--; if (RUBY_VM_INTERRUPTED(th)) { interrupted = 1; |